better logging

2 files changed, 43 insertions, 1 deletions

diff --git a/data/collector_container/Dockerfile b/data/collector_container/Dockerfile
index 05bae7a..0641587 100644
--- a/data/collector_container/Dockerfile
+++ b/data/collector_container/Dockerfile
@@ -24,6 +24,7 @@ RUN find / -xdev -perm /6000 -type f -exec chmod a-s {} \; || true
 RUN useradd collector -u 1500 -s /usr/sbin/nologin
 
 COPY ./src /app/src
+COPY ./data/logging.json /app/logging.json
 
 WORKDIR /app/
 
@@ -33,7 +34,7 @@ USER collector
 HEALTHCHECK --interval=2m --timeout=15s --retries=1 --start-period=30s \
     CMD sh ./src/collector/healthcheck.sh COLLECTOR || bash -c 'kill -s 15 1 && (sleep 7; kill -s 9 1)'
 
-ENTRYPOINT ["uvicorn", "src.collector.main:app", "--host", "0.0.0.0", "--workers", "1", "--header", "server:collector"]
+ENTRYPOINT ["uvicorn", "src.collector.main:app", "--log-config", "./logging.json", "--host", "0.0.0.0", "--workers", "1", "--header", "server:collector"]
 
 
 
diff --git a/data/logging.json b/data/logging.json
new file mode 100644
index 0000000..8bc3d45
--- /dev/null
+++ b/data/logging.json
@@ -0,0 +1,41 @@
+{
+	"version": 1,
+	"disable_existing_loggers": false,
+	"formatters": {
+		"default": {
+			"()": "uvicorn.logging.DefaultFormatter",
+			"fmt": "%(asctime)s %(levelprefix)s %(message)s",
+			"use_colors": null
+		},
+		"access": {
+			"()": "uvicorn.logging.AccessFormatter",
+			"fmt": "%(asctime)s %(levelprefix)s %(client_addr)s - \"%(request_line)s\" %(status_code)s"
+		}
+	},
+	"handlers": {
+		"default": {
+			"formatter": "default",
+			"class": "logging.StreamHandler",
+			"stream": "ext://sys.stderr"
+		},
+		"access": {
+			"formatter": "access",
+			"class": "logging.StreamHandler",
+			"stream": "ext://sys.stdout"
+		}
+	},
+	"loggers": {
+		"uvicorn": {
+			"handlers": ["default"],
+			"level": "INFO"
+		},
+		"uvicorn.error": {
+			"level": "INFO"
+		},
+		"uvicorn.access": {
+			"handlers": ["access"],
+			"level": "INFO",
+			"propagate": false
+		}
+	}
+}