Merge pull request #160 from Tastyep/develop

Develop

.github/workflows/test.yml

@@ -28,6 +28,8 @@ jobs:
         run: ./setup.sh --ci
       #
       - name: Test
+        env:
+          OPENCAST_LOG__LEVEL: DEBUG
         run: ./OpenCast.sh test all --coverage
       #
       - name: Coverage upload

.gitignore

@@ -21,3 +21,5 @@ coverage.xml
 /.coverage
 /library
 /config.yml
+.vim/
+tags

OpenCast/__init__.py

@@ -25,7 +25,9 @@
 
 def run_server(logger, infra_facade):
     try:
-        infra_facade.server.start(settings["server.host"], settings["server.port"])
+        infra_facade.server.start(
+            settings["server.host"], settings["server.port"], settings["log.api_trafic"]
+        )
     except Exception as e:
         logger.error(
             "Server exception caught", error=e, traceback=traceback.format_exc()

OpenCast/app/workflow/player.py

@@ -185,7 +185,7 @@ def on_enter_QUEUEING(self):
             self._app_facade,
             self._data_facade,
             self.video,
-            queue_front=False,
+            queue_front=True,
         )
         self._observe_start(workflow)
 

OpenCast/config.py

@@ -19,6 +19,7 @@
         default="INFO",
         is_in=["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG"],
     ),
+    Validator("LOG.API_TRAFIC", default=False, is_in=[True, False]),
     Validator("SERVER.HOST", default="0.0.0.0"),
     Validator("SERVER.PORT", default=2020),
     Validator("DATABASE.FILE", default="opencast.db"),

OpenCast/infra/io/server.py

@@ -31,10 +31,13 @@ def __init__(self, app):
     def route(self, method, route, handle):
         route = self.app.router.add_route(method, route, handle)
 
-    def start(self, host, port):
+    def start(self, host, port, log_trafic: bool):
         self._logger.info("Started", host=host, port=port)
 
-        web.run_app(self.app, host=host, port=port, access_log_class=AccessLogger)
+        options = {}
+        if log_trafic is True:
+            options["access_log_class"] = AccessLogger
+        web.run_app(self.app, host=host, port=port, **options)
 
     def make_web_socket(self):
         ws = web.WebSocketResponse()

template/config.yml

@@ -1,7 +1,10 @@
 default:
   log:
     # The level of the module's logger
+    # One of [CRITICAL, ERROR, WARNING, INFO, DEBUG]
     level: DEBUG
+    # Log requests/responses from the API
+    api_trafic: False
 
   server:
     # The IP from where the service is accessible
@@ -33,3 +36,4 @@ default:
 testing:
   log:
     level: CRITICAL
+    api_trafic: False

test/unit/test_main.py

@@ -3,27 +3,28 @@
 from test.util import TestCase
 from unittest.mock import Mock
 
+import structlog
+
 from OpenCast import run_init_workflow, run_server
 from OpenCast.app.workflow.factory import WorkflowFactory
 from OpenCast.domain.event.dispatcher import EventDispatcher
 
 
 class MainTest(TestCase):
     def test_run_server(self):
-        logger = Mock()
+        logger = structlog.get_logger("OpenCast")
         infra_facade = InfraFacadeMock()
         self.assertTrue(run_server(logger, infra_facade))
 
     def test_run_server_with_exception(self):
-        logger = Mock()
+        logger = structlog.get_logger("OpenCast")
         infra_facade = InfraFacadeMock()
 
-        def start_server():
+        def start_server(*args, **kwargs):
             raise Exception("")
 
         infra_facade.server.start.side_effect = start_server
         self.assertFalse(run_server(logger, infra_facade))
-        logger.error.assert_called_once()
 
     def test_run_init_workflow_success(self):
         app_facade = AppFacadeMock()