[DOP-15650] Allow using Horizon with multiple uvicorn workers

MobileTeleSystems · May 14, 2024 · 25ce279 · 25ce279
1 parent 4313940
commit 25ce279
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,10 +4,17 @@ services:
     image: postgres:15-alpine
     restart: unless-stopped
     env_file: .env.docker
+    # PROMETHEUS_MULTIPROC_DIR is required for multiple workers, see:
+    # https://prometheus.github.io/client_python/multiprocess/
+    environment:
+      PROMETHEUS_MULTIPROC_DIR: /tmp/prometheus-metrics
     ports:
       - 5432:5432
     volumes:
       - postgres_data:/var/lib/postgresql/data
+    # tmpfs dir is cleaned up each container restart
+    tmpfs:
+      - /tmp/prometheus-metrics
     healthcheck:
       test: pg_isready
       start_period: 5s

diff --git a/horizon/backend/settings/server/log/colored.yml b/horizon/backend/settings/server/log/colored.yml
@@ -15,7 +15,7 @@ formatters:
   colored:
     (): coloredlogs.ColoredFormatter
     # Add correlation_id to log records
-    fmt: '%(asctime)s.%(msecs)03d %(name)s:%(lineno)d [%(levelname)s] %(correlation_id)s %(message)s'
+    fmt: '%(asctime)s.%(msecs)03d %(processName)s:%(process)d %(name)s:%(lineno)d [%(levelname)s] %(correlation_id)s %(message)s'
     datefmt: '%Y-%m-%d %H:%M:%S'
 
 handlers:

diff --git a/horizon/backend/settings/server/log/json.yml b/horizon/backend/settings/server/log/json.yml
@@ -14,7 +14,7 @@ formatters:
   json:
     (): pythonjsonlogger.jsonlogger.JsonFormatter
     # Add correlation_id to log records
-    fmt: '%(name)s %(lineno)d %(levelname)s %(message)s %(correlation_id)s'
+    fmt: '%(processName)s %(process)d %(threadName)s %(thread)d %(name)s %(lineno)d %(levelname)s %(message)s %(correlation_id)s'
     timestamp: true
 
 handlers:

diff --git a/horizon/backend/settings/server/log/plain.yml b/horizon/backend/settings/server/log/plain.yml
@@ -15,7 +15,7 @@ formatters:
   plain:
     (): logging.Formatter
     # Add correlation_id to log records
-    fmt: '%(asctime)s.%(msecs)03d %(name)s:%(lineno)d [%(levelname)s] %(correlation_id)s %(message)s'
+    fmt: '%(asctime)s.%(msecs)03d %(processName)s:%(process)d %(name)s:%(lineno)d [%(levelname)s] %(correlation_id)s %(message)s'
     datefmt: '%Y-%m-%d %H:%M:%S'
 
 handlers: