Commit 4a08bc77 by John Jarvis

Adding service_variant and a little pep8 cleanup

parent 6b6d8a94
...@@ -5,6 +5,7 @@ from logging.handlers import SysLogHandler ...@@ -5,6 +5,7 @@ from logging.handlers import SysLogHandler
LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']
def get_logger_config(log_dir, def get_logger_config(log_dir,
logging_env="no_env", logging_env="no_env",
tracking_filename="tracking.log", tracking_filename="tracking.log",
...@@ -13,7 +14,8 @@ def get_logger_config(log_dir, ...@@ -13,7 +14,8 @@ def get_logger_config(log_dir,
syslog_addr=None, syslog_addr=None,
debug=False, debug=False,
local_loglevel='INFO', local_loglevel='INFO',
console_loglevel=None): console_loglevel=None,
service_variant=None):
""" """
...@@ -39,13 +41,15 @@ def get_logger_config(log_dir, ...@@ -39,13 +41,15 @@ def get_logger_config(log_dir,
console_loglevel = 'DEBUG' if debug else 'INFO' console_loglevel = 'DEBUG' if debug else 'INFO'
hostname = platform.node().split(".")[0] hostname = platform.node().split(".")[0]
syslog_format = ("[%(name)s][env:{logging_env}] %(levelname)s " syslog_format = ("[service_variant={service_variant}]"
"[%(name)s][env:{logging_env}] %(levelname)s "
"[{hostname} %(process)d] [%(filename)s:%(lineno)d] " "[{hostname} %(process)d] [%(filename)s:%(lineno)d] "
"- %(message)s").format( "- %(message)s").format(service_variant=service_variant,
logging_env=logging_env, hostname=hostname) logging_env=logging_env,
hostname=hostname)
handlers = ['console', 'local'] if debug else ['console', handlers = ['console', 'local'] if debug else ['console',
'syslogger-remote', 'local'] 'syslogger-remote', 'local']
logger_config = { logger_config = {
'version': 1, 'version': 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment