From de073deb92d4cca3e0d4cb80aec1f59189f5ae24 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas.kluyver@xfel.eu>
Date: Thu, 15 Aug 2024 15:12:40 +0100
Subject: [PATCH] Webservice logs to stderr as well as files
---
webservice/job_monitor.py | 6 ++++++
webservice/webservice.py | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/webservice/job_monitor.py b/webservice/job_monitor.py
index 12d9ebc12..9023620d6 100644
--- a/webservice/job_monitor.py
+++ b/webservice/job_monitor.py
@@ -404,6 +404,12 @@ def main(argv=None):
level=getattr(logging, args.log_level),
format=fmt
)
+ # Also log to the journal (via stderr), which keeps its own timestamps
+ streamhandler = logging.StreamHandler()
+ streamhandler.setFormatter(logging.Formatter(
+ '%(name)s - %(levelname)s - [%(filename)s:%(lineno)d] %(message)s'
+ ))
+ logging.getLogger().addHandler(streamhandler)
# DEBUG logs from kafka-python are very verbose, so we'll turn them off
logging.getLogger('kafka').setLevel(logging.INFO)
# Likewise requests_oauthlib
diff --git a/webservice/webservice.py b/webservice/webservice.py
index 3cc288755..3c9b50568 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -1625,6 +1625,12 @@ def main(argv: Optional[List[str]] = None):
level=getattr(logging, log_level),
format=fmt
)
+ # Also log to the journal (via stderr), which keeps its own timestamps
+ streamhandler = logging.StreamHandler()
+ streamhandler.setFormatter(logging.Formatter(
+ '%(name)s - %(levelname)s - [%(filename)s:%(lineno)d] %(message)s'
+ ))
+ logging.getLogger().addHandler(streamhandler)
# requests_oauthlib DEBUG logs are very verbose, so we'll turn them off
logging.getLogger('requests_oauthlib').setLevel(logging.INFO)
--
GitLab