feat: Support for process env

Author: Alan Christie

Dockerfile

@@ -51,6 +51,8 @@ ENV PATH=/.venv/bin:$PATH
 COPY app/ ./app/
 COPY logging.config .
 COPY docker-entrypoint.sh .
+COPY internal.env ./
+COPY public.env ./
 
 # Probes...
 COPY probes/*.sh .

app/app.py

@@ -41,20 +41,24 @@
 assert _AMPQ_URL, "ESS_AMPQ_URL environment variable must be set"
 _LOGGER.info("AMPQ_URL: %s", _AMPQ_URL)
 
-# Create our local database.
-# A table to record allocated Event Streams.
-# The table 'id' is an INTEGER PRIMARY KEY and so becomes an auto-incrementing
-# value when NONE is passed in as it's value.
+# SQLite database path
 _DATABASE_PATH = "/data/event-streams.db"
-_LOGGER.info("Creating SQLite database (%s)...", _DATABASE_PATH)
-_DB_CONNECTION = sqlite3.connect(_DATABASE_PATH)
-_CUR = _DB_CONNECTION.cursor()
-_CUR.execute(
-    "CREATE TABLE IF NOT EXISTS es (id INTEGER PRIMARY KEY, uuid TEXT, routing_key TEXT)"
-)
-_DB_CONNECTION.commit()
-_DB_CONNECTION.close()
-_LOGGER.info("Created.")
+
+# Logic specific to the 'internal API' process
+if os.getenv("IMAGE_ROLE", "").lower() == "internal":
+    # Create the database.
+    # A table to record allocated Event Streams.
+    # The table 'id' is an INTEGER PRIMARY KEY and so becomes an auto-incrementing
+    # value when NONE is passed in as it's value.
+    _LOGGER.info("Creating SQLite database (%s)...", _DATABASE_PATH)
+    _DB_CONNECTION = sqlite3.connect(_DATABASE_PATH)
+    _CUR = _DB_CONNECTION.cursor()
+    _CUR.execute(
+        "CREATE TABLE IF NOT EXISTS es (id INTEGER PRIMARY KEY, uuid TEXT, routing_key TEXT)"
+    )
+    _DB_CONNECTION.commit()
+    _DB_CONNECTION.close()
+    _LOGGER.info("Created.")
 
 
 # We use pydantic to declare the model (request payloads) for the internal REST API.

docker-entrypoint.sh

@@ -6,5 +6,5 @@
 # and the internal REST endpoint.
 # Done by launching two uvicorn instances in parallel.
 echo "+> Launching uvicorn..."
-uvicorn app.app:app_public --host 0.0.0.0 --port 8080 & \
-    uvicorn app.app:app_internal --host 0.0.0.0 --port 8081
+uvicorn app.app:app_public --host 0.0.0.0 --port 8080 --env-file public.env & \
+    uvicorn app.app:app_internal --host 0.0.0.0 --port --env-file internal.env 8081

internal.env

@@ -0,0 +1,2 @@
+# Env settings for the Internal API process
+IMAGE_ROLE=internal

logging.config

@@ -3,7 +3,7 @@
   "disable_existing_loggers": "true",
   "formatters": {
     "simple": {
-      "format": "%(asctime)s.%(msecs)03dZ %(module)s.%(funcName)s():%(lineno)d %(levelname)s # %(message)s",
+      "format": "%(asctime)s.%(msecs)03dZ %(thread)d %(threadName)s %(module)s.%(funcName)s():%(lineno)d %(levelname)s # %(message)s",
       "datefmt": "%Y-%m-%dT%H:%M:%S"
     }
   },

public.env

@@ -0,0 +1,2 @@
+# Env settings for the Public (WebSocket) process
+IMAGE_ROLE=public