style: Better deployment and reader logging

Author: Alan Christie

README.md

@@ -92,6 +92,9 @@ Once deployed the application's internal API will be behind the service
 `ess-internal-api` on port `8001`. The Account Server will be able to
 manage event streams via the URL `http://ess-internal-api:8001/event-stream/`.
 
+To update the running image (to deploy a new tagged version) just re-run the
+playbook with the a suitable value for `ess_image_tag`.
+
 To remove the application run the playbook again, but set the `ess_state` variable
 to `absent`: -
 

ansible/parameters-template.yaml

@@ -7,6 +7,7 @@
 # and add any additional variables and values to suit your installation in this file.
 
 ess_namespace: SetMe
+ess_image_tag: SetMe
 ess_service_account: SetMe
 ess_ws_hostname: SetMe
 ess_ampq_url: SetMe

ansible/roles/app/defaults/main.yaml

@@ -17,6 +17,8 @@ ess_ws_hostname: SetMe
 # This must include a username and password and typically an exchange.
 # For example 'amqp://username:password@rabbitmq:5672/es'
 ess_ampq_url: SetMe
+# What image tag do you want to deploy?
+ess_image_tag: SetMe
 
 # Required with defaults ---------------------------------------------------------------
 
@@ -28,7 +30,6 @@ ess_ingress_state: present
 
 # Our image details
 ess_image_owner: informaticsmatters
-ess_image_tag: 1.0.0-beta.3
 
 # Pull Policy? Always or IfNotPresent
 ess_pull_policy_always: IfNotPresent

ansible/roles/app/tasks/deploy.yaml

@@ -5,6 +5,8 @@
     that:
     - ess_namespace | length > 0
     - ess_namespace != 'SetMe'
+    - ess_image_tag | length > 0
+    - ess_image_tag != 'SetMe'
     - ess_service_account | length > 0
     - ess_service_account != 'SetMe'
     - ess_ws_hostname | length > 0

app/app.py

@@ -75,6 +75,7 @@ async def event_stream(websocket: WebSocket, uuid: str):
     using a POST to /event-stream/."""
 
     # Get the DB record for this UUID...
+    _LOGGER.debug("Connect attempt (uuid=%s)...", uuid)
     db = sqlite3.connect(_DATABASE_PATH)
     cursor = db.cursor()
     res = cursor.execute(f"SELECT * FROM es WHERE uuid='{uuid}'")
@@ -91,19 +92,25 @@ async def event_stream(websocket: WebSocket, uuid: str):
     es_id = es[0]
     routing_key: str = es[2]
 
-    await websocket.accept()
-    _LOGGER.info(
-        "Accepted connection for %s (uuid=%s routing_key=%s)", es_id, uuid, routing_key
+    _LOGGER.debug(
+        "Waiting for accept on stream %s (uuid=%s routing_key=%s)...",
+        es_id,
+        uuid,
+        routing_key,
     )
+    await websocket.accept()
+    _LOGGER.debug("Accepted connection for %s", es_id)
 
-    _LOGGER.info("Creating reader for %s...", es_id)
+    _LOGGER.debug("Creating reader for %s...", es_id)
     message_reader = _get_from_queue(routing_key)
 
-    _LOGGER.info("Reading from %s...", es_id)
+    _LOGGER.debug("Reading %s...", es_id)
     while True:
         reader = anext(message_reader)
         message_body = await reader
-        _LOGGER.info("Got %s for %s (routing_key=%s)", message_body, es_id, routing_key)
+        _LOGGER.debug(
+            "Got %s for %s (routing_key=%s)", message_body, es_id, routing_key
+        )
         await websocket.send_text(str(message_body))