diff --git a/docker/gisworker/run_gisworker b/docker/gisworker/run_gisworker index 1533fa0..62081c9 100644 --- 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 index 8dd63b3..2c6853c 100644 --- 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= \ No newline at end of file +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 index 8097cce..d3ef3cc 100644 --- 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 index 4f36f0a..fc6950b 100644 --- a/restlayer/version.py +++ b/restlayer/version.py @@ -1 +1 @@ -VERSION = '0.8.2' \ No newline at end of file +VERSION = '0.8.11' \ No newline at end of file