add db variables to env

Author: dpgiakatos

README.md

@@ -22,6 +22,10 @@ In the project root directory, create a new `.env` file to define your specific
 DATABASE_URL=postgresql://<username>:<password>@<host>:<port>/<database>
 PROXY_PATH=ihr/api
 PAGE_SIZE=100000
+POOL_SIZE=10
+MAX_OVERFLOW=5
+POOL_TIMEOUT=10
+POOL_RECYCLE=1800
 REQUEST_TIMEOUT=30
 ```
 

config/database.py

@@ -10,6 +10,10 @@
 except:
     pass
 
+POOL_SIZE = int(os.getenv("POOL_SIZE"))
+MAX_OVERFLOW = int(os.getenv("MAX_OVERFLOW"))
+POOL_TIMEOUT = int(os.getenv("POOL_TIMEOUT"))
+POOL_RECYCLE = int(os.getenv("POOL_RECYCLE"))
 REQUEST_TIMEOUT = float(os.getenv("REQUEST_TIMEOUT"))
 _statement_timeout_ms = int(REQUEST_TIMEOUT * 1000)
 
@@ -19,14 +23,14 @@
     # Create the SQLAlchemy engine with the database URL.
     # pool_size / max_overflow cap concurrent DB connections so one slow
     # query can't starve the whole server.  statement_timeout kills any
-    # single query that runs longer than 30 s so a runaway request doesn't
+    # single query that runs longer than N sec so a runaway request doesn't
     # hold a connection indefinitely.
     engine = create_engine(
     DATABASE_URL,
-        pool_size=10,
-        max_overflow=5,
-        pool_timeout=10,
-        pool_recycle=1800,
+        pool_size=POOL_SIZE,
+        max_overflow=MAX_OVERFLOW,
+        pool_timeout=POOL_TIMEOUT,
+        pool_recycle=POOL_RECYCLE,
         pool_pre_ping=True,
         connect_args={"options": f"-c statement_timeout={_statement_timeout_ms}"},
     )

main.py

@@ -53,7 +53,7 @@
     root_path="" if PROXY_PATH is None else f"/{PROXY_PATH}",
     title="IHR API",
     description=description,
-    version="v2.1",
+    version="v2.2",
     redoc_url=None,
     swagger_ui_parameters={ "defaultModelsExpandDepth": -1 },
 )
@@ -95,7 +95,8 @@ async def access_logging_middleware(request: Request, call_next):
     finally:
         duration_s = time.perf_counter() - start
         client = request.client.host if request.client else "unknown"
-        msg = '%s - "%s %s" %s %.3fs', client, request.method, request.url.path, status, duration_s
+        path = request.url.path + ("?" + str(request.url.query) if request.url.query else "")
+        msg = '%s - "%s %s" %s %.3fs', client, request.method, path, status, duration_s
         if status >= 500:
             logger.error(*msg)
         elif status >= 400: