Merge pull request #298 from KNMI/access-log

Fix access log.

Docker/start.sh

@@ -36,6 +36,6 @@ then
 fi
 
 echo "Start serving on ${EXTERNALADDRESS}"
-gunicorn --bind 0.0.0.0:8080 --workers=4 -k uvicorn.workers.UvicornWorker --disable-redirect-access-to-syslog --access-logfile - --access-logformat 'accesslog %(h)s ; %(t)s ; %(H)s ; %(m)s ; %(u)s ; %(q)s ; %(s)s ; %(M)s ; "%(a)s"' main:app
+gunicorn --bind 0.0.0.0:8080 --workers=4 -k uvicorn.workers.UvicornWorker --disable-redirect-access-to-syslog --access-logfile - main:app
 
 

Dockerfile

@@ -6,9 +6,7 @@ USER root
 LABEL maintainer="[email protected]"
 
 # Version should be same as in Definitions.h
-LABEL version="2.13.5"
-
-######### First stage (build) ############
+LABEL version="2.13.6"
 
 # Try to update image packages
 RUN apt-get -q -y update \

NEWS.md

@@ -1,3 +1,6 @@
+**Version 2.13.6 2023-10-06**
+- Restored access log to original format (was broken since move to FastAPI) 
+
 **Version 2.13.5 2023-10-05**
 - KNMI HDF5 dual-pol data now picks scans 15, 16, 6,
 14, 5, 13, 4, 12, 3

adagucserverEC/Definitions.h

@@ -28,7 +28,7 @@
 #ifndef Definitions_H
 #define Definitions_H
 
-#define ADAGUCSERVER_VERSION "2.13.5" // Please also update in the Dockerfile to the same version
+#define ADAGUCSERVER_VERSION "2.13.6" // Please also update in the Dockerfile to the same version
 
 // CConfigReaderLayerType
 #define CConfigReaderLayerTypeUnknown 0

python/python_fastapi_server/main.py

@@ -7,6 +7,7 @@
 from brotli_asgi import BrotliMiddleware
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
+from asgi_logger import AccessLoggerMiddleware
 
 from configure_logging import configure_logging
 from routers.autowms import autowms_router
@@ -21,6 +22,11 @@
 
 app = FastAPI()
 
+# Set uvicorn access log format using middleware
+access_log_format = 'accesslog %(h)s ; %(t)s ; %(H)s ; %(m)s ; %(U)s ; %(q)s ; %(s)s ; %(M)s ; "%(a)s"'
+logging.getLogger("uvicorn.access").handlers.clear()
+app.add_middleware(AccessLoggerMiddleware, format=access_log_format)
+logging.getLogger("access").propagate = False
 
 @app.middleware("http")
 async def add_process_time_header(request: Request, call_next):

requirements.in

@@ -8,6 +8,7 @@ Jinja2~=3.1
 OWSLib~=0.29.2
 Pillow~=10.0
 Werkzeug~=2.3
+asgi-logger~=0.1.0
 brotli-asgi~=1.4
 cachetools~=5.3
 cftime~=1.6

requirements.txt

@@ -8,6 +8,10 @@ anyio==4.0.0
     # via
     #   httpcore
     #   starlette
+asgi-logger==0.1.0
+    # via -r requirements.in
+asgiref==3.7.2
+    # via asgi-logger
 brotli==1.1.0
     # via
     #   -r requirements.in
@@ -108,6 +112,7 @@ starlette==0.27.0
     #   fastapi
 typing-extensions==4.8.0
     # via
+    #   asgiref
     #   fastapi
     #   pydantic
     #   uvicorn