Merge branch 'master' into ops/disable_connection_pool

Signed-off-by: Florian <floriansw@t-online.de>

Author: FlorianSW

docker-compose-common-components.yaml

@@ -17,6 +17,8 @@ services:
       - common
   postgres:
     image: ${POSTGRES_IMAGE}
+    # Increases the default 100 to 300
+    command: postgres -c max_connections=300
     environment:
       # If a password is not defined this container will fail to create
       POSTGRES_PASSWORD: ${HLL_DB_PASSWORD}

rcon/models.py

@@ -1,10 +1,11 @@
 import logging
 import os
 import re
+import sys
 from collections import defaultdict
 from contextlib import contextmanager
 from datetime import datetime, timezone
-from typing import Any, Generator, List, Literal, Optional, Sequence, overload, TypedDict
+from typing import Any, Generator, List, Literal, Optional, Sequence, overload
 
 import pydantic
 from sqlalchemy import TIMESTAMP, Enum, ForeignKey, String, create_engine, select, text, JSON, Engine, NullPool, Pool
@@ -73,6 +74,30 @@
 _ENGINE: Engine | None = None
 
 
+def _connection_name() -> str:
+    """
+    Identify what application component is using the SQLAlchemy session. This can be helpful when inspecting the connections
+    in Postgres to identify the purpose of a connection. The connection name will be used as the application_name connection
+    property and show up in the pg_stat_activity table:
+    select * from pg_stat_activity;
+
+    :return: str
+    """
+    args = sys.argv
+    name = 'CRCon Generic'
+    if "manage.py" not in args[0]:
+        # stuff like daphne, gunicorn (backend) etc
+        name = args[0]
+    elif len(args) > 1 and args[1] != "":
+        # Take whatever argument we passed to manage.py (for Supervisor services, such as log_loop, etc)
+        name = args[1]
+
+    name = (os.getenv("SERVER_NUMBER") or "") + name
+    # in the standard build (which we use in teh default docker setup) the name cannot exceed 63 chars (less than 64),
+    # see https://www.postgresql.org/docs/current/runtime-config-logging.html#GUC-APPLICATION-NAME
+    return name[:63]
+
+
 def get_engine():
     global _ENGINE
 
@@ -88,7 +113,7 @@ def get_engine():
     if os.getenv("HLL_DB_DISABLE_CONNECTION_POOL") is not None:
         pool = NullPool
 
-    _ENGINE = create_engine(url, poolclass=pool, echo=False)
+    _ENGINE = create_engine(url, poolclass=pool, echo=False, connect_args={"application_name":_connection_name()})
     return _ENGINE
 
 

rcongui/package-lock.json

@@ -81,7 +81,7 @@
     "@vitejs/plugin-react": "^4.5.2",
     "miragejs": "^0.1.48",
     "prettier": "^2.8.8",
-    "vite": "^6.4.1"
+    "vite": "^6.4.2"
   },
   "browserslist": {
     "production": [

rcongui/package.json

@@ -118,7 +118,7 @@
     "tailwindcss": "3.4.16",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.2",
-    "vite": "^6.4.1",
+    "vite": "^6.4.2",
     "vite-plugin-external": "^4.3.1",
     "vite-plugin-svgr": "^4.3.0"
   }

rcongui_public/package-lock.json

@@ -253,6 +253,9 @@
         "HOST": db_info["HOST"],
         "PORT": db_info["PORT"],
         "NAME": db_info["NAME"],
+        "OPTIONS": {
+            "application_name": (os.getenv("SERVER_NUMBER") or "") + "Django",
+        }
     }
 }