From 0be8a9527bfb6915a28ebe67b50ca6df2b21e6ad Mon Sep 17 00:00:00 2001 From: anikin-aa Date: Mon, 14 Jan 2019 10:46:38 +0300 Subject: [PATCH] possibility to set `logdatefmt` via env. (#904) The value could be configured via `PATRONI_LOGDATEFMT` environment variable. The default value is `%Y-%m-%d %H:%M:%S` --- patroni/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/patroni/__init__.py b/patroni/__init__.py index be843c8e..b032c79b 100644 --- a/patroni/__init__.py +++ b/patroni/__init__.py @@ -142,9 +142,10 @@ def patroni_main(): logdir = os.environ.get('PATRONI_FILE_LOG_DIR', None) logformat = os.environ.get('PATRONI_LOGFORMAT', '%(asctime)s %(levelname)s: %(message)s') loglevel = os.environ.get('PATRONI_LOGLEVEL', 'INFO') + logdatefmt = os.environ.get('PATRONI_LOGDATEFMT', '%Y-%m-%d %H:%M:%S') if not logdir: - logging.basicConfig(format=logformat, level=loglevel) + logging.basicConfig(format=logformat, level=loglevel, datefmt=logdatefmt) else: logsize = os.environ.get('PATRONI_FILE_LOG_SIZE', 25000000) lognum = os.environ.get('PATRONI_FILE_LOG_NUM', 4) @@ -153,7 +154,7 @@ def patroni_main(): root_logger.setLevel(loglevel) handler = RotatingFileHandler(os.path.join(logdir, 'patroni.log'), mode='a', maxBytes=logsize, backupCount=lognum) - handler.setFormatter(logging.Formatter(logformat)) + handler.setFormatter(logging.Formatter(logformat, logdatefmt)) root_logger.addHandler(handler) patroni = Patroni()