Merge pull request #67 from ActivityWatch/dev/server-next

Major server refactoring
ActivityWatch · Jun 14, 2017 · f5cf0e2 · f5cf0e2
2 parents c90a1a9 + 8a428e1
commit f5cf0e2
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 91 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,12 @@
 build
 dist
 __pycache__
+.*cache
 
 # Old repo
 activity-watch
 
 .idea
+venv*
+old
+other
diff --git a/Makefile b/Makefile
@@ -28,6 +28,7 @@ uninstall:
 
 test:
 	make --directory=aw-core test
+	make --directory=aw-server test
 	make --directory=aw-qt test
 
 test-integration:

diff --git a/aw-client b/aw-client
diff --git a/aw-core b/aw-core
diff --git a/aw-qt b/aw-qt
diff --git a/aw-server b/aw-server
diff --git a/aw-watcher-afk b/aw-watcher-afk
diff --git a/aw-watcher-window b/aw-watcher-window
diff --git a/aw-webui b/aw-webui
diff --git a/scripts/contributor-stats.py b/scripts/contributor-stats.py
diff --git a/scripts/tests/integration_tests.py b/scripts/tests/integration_tests.py
@@ -20,22 +20,21 @@ def server_process():
     logfile_stdout = tempfile.NamedTemporaryFile(delete=False)
     logfile_stderr = tempfile.NamedTemporaryFile(delete=False)
 
-    @contextmanager
-    def _cm_server_process():
-        server_proc = subprocess.Popen(["aw-server", "--testing"], stdout=logfile_stdout, stderr=logfile_stderr)
-        sleep(2)  # Startup time
-        yield server_proc
-        sleep(2)  # Cleanup time, could probably be removed once tests are synchronous
-        if platform.system() == "Windows":
-            # On Windows, for whatever reason, server_proc.kill() doesn't do the job.
-            _windows_kill_process(server_proc.pid)
-        else:
-            server_proc.kill()
-        server_proc.wait(5)
-        server_proc.communicate()
-
-    with _cm_server_process() as server_proc:
-        yield server_proc
+    server_proc = subprocess.Popen(["aw-server", "--testing"], stdout=logfile_stdout, stderr=logfile_stderr)
+
+    # Wait for server to start up properly
+    # TODO: Ping the server until it's alive to remove this sleep
+    sleep(5)
+
+    yield server_proc
+
+    if platform.system() == "Windows":
+        # On Windows, for whatever reason, server_proc.kill() doesn't do the job.
+        _windows_kill_process(server_proc.pid)
+    else:
+        server_proc.kill()
+    server_proc.wait(5)
+    server_proc.communicate()
 
     error_indicators = ["ERROR"]
+2 −0		.coveragerc
+1 −0		.gitignore
+1 −1		aw_core/__about__.py
+2 −1		aw_core/__init__.py
+1 −1		aw_core/cached_views.py
+1 −1		aw_core/config.py
+10 −18		aw_core/dirs.py
+10 −4		aw_core/log.py
+11 −10		aw_core/models.py
+5 −4		aw_core/schema.py
+19 −0		aw_core/schemas/event.json
+110 −60		aw_core/transforms.py
+1 −1		aw_core/views.py
+5 −2		aw_datastore/__init__.py
+23 −10		aw_datastore/benchmark.py
+1 −1		aw_datastore/datastore.py
+1 −1		aw_datastore/storages/__init__.py
+22 −15		aw_datastore/storages/peewee.py
+0 −84		schemas/event.json
+1 −0		setup.py
+6 −0		stubs/appdirs.pyi
+4 −3		tests/test_datastore.py
+23 −23		tests/test_schemas.py
+2 −0		.gitignore
+6 −2		Makefile
+3 −2		aw_server/__init__.py
+115 −378		aw_server/api.py
+2 −3		aw_server/config.py
+7 −0		aw_server/exceptions.py
+2 −10		aw_server/log.py
+2 −3		aw_server/main.py
+217 −0		aw_server/rest.py
+13 −6		aw_server/server.py
+14 −0		requirements.txt
+4 −17		setup.py
+133 −15		tests/test_client.py
+49 −70		aw_watcher_afk/afk.py
+0 −0		aw_watcher_afk/config.py
+4 −4		aw_watcher_afk/unix.py
+2 −2		aw_watcher_afk/windows.py
+4 −0		.travis.yml
+1 −1		build/webpack.dev.conf.js
+57 −7		src/App.vue
+1 −1		src/resources.js
+2 −1		src/views/Bucket.vue
+1 −48		src/views/Home.vue