From f14ddb856f24a56bf27b4af81c98525c175d911b Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 27 Jun 2018 13:01:35 +0200 Subject: [PATCH 1/2] Add gunicorn logging config for all the API services which run under gunicorn (st2api, st2auth, st2stream). In production, those services run in a worker subprocess which is managed by gunicorn master process. If we don't have a special logging config file for gunicorn worker processes, some messages which are produced by gunicorn workers are lost. This makes debugging and other things a lot harder. --- st2api/conf/logging.gunicorn.conf | 38 ++++++++++++++++++++++++++++ st2auth/conf/logging.gunicorn.conf | 38 ++++++++++++++++++++++++++++ st2stream/conf/logging.gunicorn.conf | 38 ++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 st2api/conf/logging.gunicorn.conf create mode 100644 st2auth/conf/logging.gunicorn.conf create mode 100644 st2stream/conf/logging.gunicorn.conf diff --git a/st2api/conf/logging.gunicorn.conf b/st2api/conf/logging.gunicorn.conf new file mode 100644 index 0000000000..83ca447d91 --- /dev/null +++ b/st2api/conf/logging.gunicorn.conf @@ -0,0 +1,38 @@ +[loggers] +keys=root + +[handlers] +keys=consoleHandler, fileHandler + +[formatters] +keys=simpleConsoleFormatter + +[logger_root] +level=INFO +handlers=consoleHandler, fileHandler, auditHandler + +[handler_consoleHandler] +class=StreamHandler +level=INFO +formatter=simpleConsoleFormatter +args=(sys.stdout,) + +[handler_fileHandler] +class=handlers.RotatingFileHandler +level=INFO +formatter=verboseConsoleFormatter +args=("logs/st2auth.log",) + +[formatter_simpleConsoleFormatter] +class=st2common.logging.formatters.ConsoleLogFormatter +format=%(asctime)s %(levelname)s [-] %(message)s +datefmt= + +[formatter_verboseConsoleFormatter] +class=st2common.logging.formatters.ConsoleLogFormatter +format=%(asctime)s %(thread)s %(levelname)s %(module)s [-] %(message)s +datefmt= + +[formatter_gelfFormatter] +class=st2common.logging.formatters.GelfLogFormatter +format=%(message)s diff --git a/st2auth/conf/logging.gunicorn.conf b/st2auth/conf/logging.gunicorn.conf new file mode 100644 index 0000000000..83ca447d91 --- /dev/null +++ b/st2auth/conf/logging.gunicorn.conf @@ -0,0 +1,38 @@ +[loggers] +keys=root + +[handlers] +keys=consoleHandler, fileHandler + +[formatters] +keys=simpleConsoleFormatter + +[logger_root] +level=INFO +handlers=consoleHandler, fileHandler, auditHandler + +[handler_consoleHandler] +class=StreamHandler +level=INFO +formatter=simpleConsoleFormatter +args=(sys.stdout,) + +[handler_fileHandler] +class=handlers.RotatingFileHandler +level=INFO +formatter=verboseConsoleFormatter +args=("logs/st2auth.log",) + +[formatter_simpleConsoleFormatter] +class=st2common.logging.formatters.ConsoleLogFormatter +format=%(asctime)s %(levelname)s [-] %(message)s +datefmt= + +[formatter_verboseConsoleFormatter] +class=st2common.logging.formatters.ConsoleLogFormatter +format=%(asctime)s %(thread)s %(levelname)s %(module)s [-] %(message)s +datefmt= + +[formatter_gelfFormatter] +class=st2common.logging.formatters.GelfLogFormatter +format=%(message)s diff --git a/st2stream/conf/logging.gunicorn.conf b/st2stream/conf/logging.gunicorn.conf new file mode 100644 index 0000000000..83ca447d91 --- /dev/null +++ b/st2stream/conf/logging.gunicorn.conf @@ -0,0 +1,38 @@ +[loggers] +keys=root + +[handlers] +keys=consoleHandler, fileHandler + +[formatters] +keys=simpleConsoleFormatter + +[logger_root] +level=INFO +handlers=consoleHandler, fileHandler, auditHandler + +[handler_consoleHandler] +class=StreamHandler +level=INFO +formatter=simpleConsoleFormatter +args=(sys.stdout,) + +[handler_fileHandler] +class=handlers.RotatingFileHandler +level=INFO +formatter=verboseConsoleFormatter +args=("logs/st2auth.log",) + +[formatter_simpleConsoleFormatter] +class=st2common.logging.formatters.ConsoleLogFormatter +format=%(asctime)s %(levelname)s [-] %(message)s +datefmt= + +[formatter_verboseConsoleFormatter] +class=st2common.logging.formatters.ConsoleLogFormatter +format=%(asctime)s %(thread)s %(levelname)s %(module)s [-] %(message)s +datefmt= + +[formatter_gelfFormatter] +class=st2common.logging.formatters.GelfLogFormatter +format=%(message)s From 703fb856f36cbe3b4678d190aeabeb1e4e0872ac Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 27 Jun 2018 13:31:13 +0200 Subject: [PATCH 2/2] Fix and simplify logging configs. --- st2api/conf/logging.gunicorn.conf | 14 ++++---------- st2auth/conf/logging.gunicorn.conf | 12 +++--------- st2stream/conf/logging.gunicorn.conf | 14 ++++---------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/st2api/conf/logging.gunicorn.conf b/st2api/conf/logging.gunicorn.conf index 83ca447d91..3b2f6ad051 100644 --- a/st2api/conf/logging.gunicorn.conf +++ b/st2api/conf/logging.gunicorn.conf @@ -2,26 +2,20 @@ keys=root [handlers] -keys=consoleHandler, fileHandler +keys=fileHandler [formatters] -keys=simpleConsoleFormatter +keys=simpleConsoleFormatter, verboseConsoleFormatter, gelfFormatter [logger_root] level=INFO -handlers=consoleHandler, fileHandler, auditHandler - -[handler_consoleHandler] -class=StreamHandler -level=INFO -formatter=simpleConsoleFormatter -args=(sys.stdout,) +handlers=fileHandler [handler_fileHandler] class=handlers.RotatingFileHandler level=INFO formatter=verboseConsoleFormatter -args=("logs/st2auth.log",) +args=("logs/st2api.log",) [formatter_simpleConsoleFormatter] class=st2common.logging.formatters.ConsoleLogFormatter diff --git a/st2auth/conf/logging.gunicorn.conf b/st2auth/conf/logging.gunicorn.conf index 83ca447d91..6de61cb8fa 100644 --- a/st2auth/conf/logging.gunicorn.conf +++ b/st2auth/conf/logging.gunicorn.conf @@ -2,20 +2,14 @@ keys=root [handlers] -keys=consoleHandler, fileHandler +keys=fileHandler [formatters] -keys=simpleConsoleFormatter +keys=simpleConsoleFormatter, verboseConsoleFormatter, gelfFormatter [logger_root] level=INFO -handlers=consoleHandler, fileHandler, auditHandler - -[handler_consoleHandler] -class=StreamHandler -level=INFO -formatter=simpleConsoleFormatter -args=(sys.stdout,) +handlers=fileHandler [handler_fileHandler] class=handlers.RotatingFileHandler diff --git a/st2stream/conf/logging.gunicorn.conf b/st2stream/conf/logging.gunicorn.conf index 83ca447d91..d85831debb 100644 --- a/st2stream/conf/logging.gunicorn.conf +++ b/st2stream/conf/logging.gunicorn.conf @@ -2,26 +2,20 @@ keys=root [handlers] -keys=consoleHandler, fileHandler +keys=fileHandler [formatters] -keys=simpleConsoleFormatter +keys=simpleConsoleFormatter, verboseConsoleFormatter, gelfFormatter [logger_root] level=INFO -handlers=consoleHandler, fileHandler, auditHandler - -[handler_consoleHandler] -class=StreamHandler -level=INFO -formatter=simpleConsoleFormatter -args=(sys.stdout,) +handlers=fileHandler [handler_fileHandler] class=handlers.RotatingFileHandler level=INFO formatter=verboseConsoleFormatter -args=("logs/st2auth.log",) +args=("logs/st2stream.log",) [formatter_simpleConsoleFormatter] class=st2common.logging.formatters.ConsoleLogFormatter