Merge pull request #84 from OCHA-DAP/dev

PR from DEV to PROD
OCHA-DAP · Nov 16, 2023 · aa5d74e · aa5d74e
2 parents 459e0d3 + 9a9d6b3
commit aa5d74e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/docker/gisworker/run_gisworker b/docker/gisworker/run_gisworker
@@ -16,6 +16,9 @@ envsubst < /srv/gislayer/docker/app.conf.tpl > /srv/app.conf
 
 # regenerate logging.conf
 export LOG_LEVEL="${LOG_LEVEL:-INFO}"
+[ ! -z "${LOG_LEVEL_CONSOLE}" ] || export LOG_LEVEL_CONSOLE=${LOG_LEVEL}
+[ ! -z "${LOG_LEVEL_JSON}" ] || export LOG_LEVEL_JSON=${LOG_LEVEL}
+[ ! -z "${LOG_LEVEL_TXT}" ] || export LOG_LEVEL_TXT=${LOG_LEVEL}
 envsubst < /srv/gislayer/docker/logging.conf.tpl > /srv/logging.conf
 
 cd /srv/gislayer

diff --git a/docker/logging.conf.tpl b/docker/logging.conf.tpl
@@ -2,69 +2,79 @@
 keys=root,importapi,deleteapi,analyticsapi,schedulerapi,filestructurecheckapi,eventapi,werkzeug
 
 [handlers]
-keys=consoleHandler, fileHandler
+keys=consoleHandler, fileHandler, jsonFileHandler
 
 [formatters]
-keys=simpleFormatter
+keys=simpleFormatter, jsonFormatter
 
 [logger_root]
 level=${LOG_LEVEL}
-handlers=consoleHandler, fileHandler
+handlers=consoleHandler, fileHandler, jsonFileHandler
 
 [logger_werkzeug]
 level=WARNING
-handlers=consoleHandler, fileHandler
+handlers=consoleHandler, fileHandler, jsonFileHandler
 qualname=werkzeug
 propagate=0
 
 [logger_importapi]
 level=${LOG_LEVEL}
-handlers=consoleHandler, fileHandler
+handlers=consoleHandler, fileHandler, jsonFileHandler
 qualname=importapi
 propagate=0
 
 [logger_deleteapi]
 level=${LOG_LEVEL}
-handlers=consoleHandler, fileHandler
+handlers=consoleHandler, fileHandler, jsonFileHandler
 qualname=deleteapi
 propagate=0
 
 [logger_analyticsapi]
 level=${LOG_LEVEL}
-handlers=consoleHandler, fileHandler
+handlers=consoleHandler, fileHandler, jsonFileHandler
 qualname=analyticsapi
 propagate=0
 
 [logger_schedulerapi]
 level=${LOG_LEVEL}
-handlers=consoleHandler, fileHandler
+handlers=consoleHandler, fileHandler, jsonFileHandler
 qualname=schedulerapi
 propagate=0
 
 [logger_filestructurecheckapi]
 level=${LOG_LEVEL}
-handlers=consoleHandler, fileHandler
+handlers=consoleHandler, fileHandler, jsonFileHandler
 qualname=schedulerapi
 propagate=0
 
 [logger_eventapi]
 level=${LOG_LEVEL}
-handlers=consoleHandler, fileHandler
+handlers=consoleHandler, fileHandler, jsonFileHandler
 qualname=schedulerapi
 propagate=0
 
 [handler_consoleHandler]
 class=StreamHandler
-level=DEBUG
+level=${LOG_LEVEL_CONSOLE}
 formatter=simpleFormatter
 args=(sys.stdout,)
 
 [handler_fileHandler]
 class = FileHandler
 args = ('/var/log/gis.log','a')
-level = NOTSET
+level=${LOG_LEVEL_TXT}
 formatter = simpleFormatter
 
+[handler_jsonFileHandler]
+class = FileHandler
+args = ('/var/log/gis-json.log','a')
+level=${LOG_LEVEL_JSON}
+formatter = jsonFormatter
+
 [formatter_simpleFormatter]
 format=%(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)d] %(message)s
-datefmt=
+datefmt=
+
+[formatter_jsonFormatter]
+format = %(asctime)s %(levelname) %(threadName)s %(name)s %(lineno)d %(message)s %(funcName)s
+class = pythonjsonlogger.jsonlogger.JsonFormatter
diff --git a/docker/run_gislayer b/docker/run_gislayer
@@ -16,6 +16,9 @@ envsubst < /srv/gislayer/docker/app.conf.tpl > /srv/app.conf
 
 # regenerate logging.conf
 export LOG_LEVEL="${LOG_LEVEL:-INFO}"
+[ ! -z "${LOG_LEVEL_CONSOLE}" ] || export LOG_LEVEL_CONSOLE=${LOG_LEVEL}
+[ ! -z "${LOG_LEVEL_JSON}" ] || export LOG_LEVEL_JSON=${LOG_LEVEL}
+[ ! -z "${LOG_LEVEL_TXT}" ] || export LOG_LEVEL_TXT=${LOG_LEVEL}
 envsubst < /srv/gislayer/docker/logging.conf.tpl > /srv/logging.conf
 
 cd /srv/gislayer

diff --git a/restlayer/version.py b/restlayer/version.py
@@ -1 +1 @@
-VERSION = '0.8.2'
+VERSION = '0.8.11'