From f1f52b6feee21660a01bfff9f8208d72bf7cfb98 Mon Sep 17 00:00:00 2001 From: jverswijver Date: Wed, 17 Aug 2022 10:49:13 -0500 Subject: [PATCH 1/3] tweak logging behavior --- datajoint/settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/datajoint/settings.py b/datajoint/settings.py index 3da611af6..9c393d566 100644 --- a/datajoint/settings.py +++ b/datajoint/settings.py @@ -248,6 +248,8 @@ def __setitem__(self, key, value): self._conf[key] = value else: raise DataJointError("Validator for {0:s} did not pass".format(key)) + if "loglevel" in key: + logger.setLevel(value) # Load configuration from file @@ -272,6 +274,7 @@ def __setitem__(self, key, value): "database.password", "external.aws_access_key_id", "external.aws_secret_access_key", + "loglevel", ), map( os.getenv, @@ -281,6 +284,7 @@ def __setitem__(self, key, value): "DJ_PASS", "DJ_AWS_ACCESS_KEY_ID", "DJ_AWS_SECRET_ACCESS_KEY", + "DJ_LOG_LEVEL", ), ), ) From 9bb15f3371b160473398aac978f66e9c8897953b Mon Sep 17 00:00:00 2001 From: jverswijver Date: Wed, 17 Aug 2022 10:55:44 -0500 Subject: [PATCH 2/3] add validation for logging levels --- datajoint/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datajoint/settings.py b/datajoint/settings.py index 9c393d566..75262bb7b 100644 --- a/datajoint/settings.py +++ b/datajoint/settings.py @@ -248,7 +248,8 @@ def __setitem__(self, key, value): self._conf[key] = value else: raise DataJointError("Validator for {0:s} did not pass".format(key)) - if "loglevel" in key: + valid_logging_levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] + if "loglevel" in key and key in valid_logging_levels: logger.setLevel(value) From 697b0e841ecc471d63eefee2e2b969f01d025c79 Mon Sep 17 00:00:00 2001 From: jverswijver Date: Wed, 17 Aug 2022 10:56:23 -0500 Subject: [PATCH 3/3] fix bug --- datajoint/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datajoint/settings.py b/datajoint/settings.py index 75262bb7b..110bf6534 100644 --- a/datajoint/settings.py +++ b/datajoint/settings.py @@ -249,7 +249,7 @@ def __setitem__(self, key, value): else: raise DataJointError("Validator for {0:s} did not pass".format(key)) valid_logging_levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] - if "loglevel" in key and key in valid_logging_levels: + if "loglevel" in key and value in valid_logging_levels: logger.setLevel(value)