From ae27d69a29dee862716aa8619bb8536e779a7235 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Wed, 26 Sep 2018 17:15:05 +0200
Subject: [PATCH] Refactored logging config.
---
nomad/config.py | 2 ++
nomad/processing/base.py | 3 ++-
nomad/utils.py | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/nomad/config.py b/nomad/config.py
index 742d984d06..1b92c5a5c2 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -85,3 +85,5 @@ services = NomadServicesConfig(
api_base_path=os.environ.get('NOMAD_API_BASE_PATH', '/nomad/api'),
api_secret=os.environ.get('NOMAD_API_SECRET', 'defaultApiSecret')
)
+
+console_log_level = getattr(logging, os.environ.get('NOMAD_CONSOLE_LOGLEVEL', 'INFO'), 'INFO')
diff --git a/nomad/processing/base.py b/nomad/processing/base.py
index a03e15bc3a..59ad1e351c 100644
--- a/nomad/processing/base.py
+++ b/nomad/processing/base.py
@@ -39,11 +39,12 @@ if config.logstash.enabled:
@worker_process_init.connect
def setup(**kwargs):
+ utils.get_logger(__name__).debug('test debug log entry')
infrastructure.setup()
app = Celery('nomad.processing', broker=config.celery.broker_url)
-
+app.conf.update(worker_hijack_root_logger=False)
PENDING = 'PENDING'
RUNNING = 'RUNNING'
diff --git a/nomad/utils.py b/nomad/utils.py
index fa48143ae9..d83335bef2 100644
--- a/nomad/utils.py
+++ b/nomad/utils.py
@@ -116,10 +116,10 @@ if not _logging_is_configured:
wrapper_class=structlog.stdlib.BoundLogger)
# configure logging in general
- logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
+ logging.basicConfig(stream=sys.stdout)
root = logging.getLogger()
for handler in root.handlers:
- handler.setLevel(logging.WARNING if 'pytest' not in sys.modules else logging.CRITICAL)
+ handler.setLevel(config.console_log_level if 'pytest' not in sys.modules else logging.CRITICAL)
# configure logstash
if config.logstash.enabled and 'pytest' not in sys.modules:
--
GitLab