fix: Fix messages and correct byte to string comparison

Author: Alan Christie

ansible/roles/app/templates/deployment.yaml.j2

@@ -40,32 +40,6 @@ spec:
                 operator: Exists
 
       containers:
-      - name: memcached
-        image: memcached:{{ ess_memcached_tag }}
-        ports:
-        - containerPort: 11211
-          name: memcached
-        env:
-        - name: MEMCACHED_MAX_CONNECTIONS
-          value: '{{ ess_memcached_max_connections }}'
-        - name: MEMCACHED_MAX_ITEM_SIZE
-          value: '36'
-        - name: MEMCACHED_MEMORY_LIMIT
-          value: '{{ ess_memcached_memory_limit }}'
-        resources:
-          requests:
-            cpu: {{ ess_memcached_cpu_request }}
-            memory: {{ ess_memcached_mem_request }}
-{% if ess_memcached_cpu_limit or ess_memcached_mem_limit %}
-          limits:
-{% if ess_memcached_cpu_limit %}
-            cpu: {{ ess_memcached_cpu_limit }}
-{% endif %}
-{% if ess_memcached_mem_limit %}
-            memory: {{ ess_memcached_mem_limit }}
-{% endif %}
-{% endif %}
-
       - name: ess
         image: {{ ess_image_owner }}/squonk2-fastapi-ws-event-stream:{{ ess_image_tag }}
 {% if ess_image_tag in ['latest', 'stable'] or ess_pull_policy_always %}
@@ -137,6 +111,32 @@ spec:
 {% if ess_api_mem_limit %}
             memory: {{ ess_api_mem_limit }}
 {% endif %}
+{% endif %}
+
+      - name: memcached
+        image: memcached:{{ ess_memcached_tag }}
+        ports:
+        - containerPort: 11211
+          name: memcached
+        env:
+        - name: MEMCACHED_MAX_CONNECTIONS
+          value: '{{ ess_memcached_max_connections }}'
+        - name: MEMCACHED_MAX_ITEM_SIZE
+          value: '36'
+        - name: MEMCACHED_MEMORY_LIMIT
+          value: '{{ ess_memcached_memory_limit }}'
+        resources:
+          requests:
+            cpu: {{ ess_memcached_cpu_request }}
+            memory: {{ ess_memcached_mem_request }}
+{% if ess_memcached_cpu_limit or ess_memcached_mem_limit %}
+          limits:
+{% if ess_memcached_cpu_limit %}
+            cpu: {{ ess_memcached_cpu_limit }}
+{% endif %}
+{% if ess_memcached_mem_limit %}
+            memory: {{ ess_memcached_mem_limit }}
+{% endif %}
 {% endif %}
 
       volumes:

app/app.py

@@ -327,19 +327,19 @@ async def event_stream(
     # That's fine - the on_message_for_websocket() function will notice this
     # on the next message and should shut itself down.
     new_socket_uuid: str = python_uuid.uuid4()
-    _LOGGER.warning(
-        "Assigning unique WebSocket ID (%s) for this EventStream (routing_key=%s uuid=%s)",
+    _LOGGER.info(
+        "Assigning unique WebSocket ID (%s) for %s (routing_key=%s uuid=%s)",
+        es_id,
         new_socket_uuid,
         es_routing_key,
         uuid,
     )
-    existing_socket_uuid: str = _MEMCACHED_CLIENT.get(es_routing_key)
+    existing_socket_uuid: str = _MEMCACHED_CLIENT.get(es_routing_key).decode("utf-8")
     if existing_socket_uuid and existing_socket_uuid != new_socket_uuid:
         _LOGGER.warning(
-            "Replaced routing key %s WebSocket unique ID (%s) with ours (%s)",
-            es_routing_key,
+            "Replacing existing WebSocket unique ID (%s) with ours (id=%s)",
             existing_socket_uuid,
-            new_socket_uuid,
+            es_id,
         )
     _MEMCACHED_CLIENT.set(es_routing_key, new_socket_uuid)
 
@@ -405,7 +405,7 @@ async def on_message_for_websocket(
         #    (e.g. our UUID is not the value of the cached routing key im memcached).
         #    This typically means we've been replaced by a new stream.
         # 2. We get a POISON message
-        stream_socket_uuid: str = _MEMCACHED_CLIENT.get(es_routing_key)
+        stream_socket_uuid: str = _MEMCACHED_CLIENT.get(es_routing_key).decode("utf-8")
         if stream_socket_uuid != es_websocket_uuid:
             _LOGGER.info(
                 "There is a new owner of %s (%s), and it is not us (%s) (stopping)...",

docker-compose.yml

@@ -22,7 +22,7 @@ services:
     container_name: memcached
     environment:
       MEMCACHED_MAX_ITEM_SIZE: 36
-      MEMCACHED_MAX_CONNECTIONS: 8
+      MEMCACHED_MAX_CONNECTIONS: 1
       MEMCACHED_MEMORY_LIMIT: 64
     ports:
     - '11211:11211'