openstack/devstack
Code Issues Proposed changes

Merge "Restore log colors under devstack/systemd"

Browse Source
This commit is contained in:
Jenkins
2017-05-17 20:10:30 +00:00
committed by Gerrit Code Review
parent 5ff1b476e4 8cd310d763
commit e19abda40a
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
functions
View File

@@ -616,21 +616,18 @@ function setup_systemd_logging {
# request-id. However, there may be an eventlet interaction here,
# so going off for now.
USE_JOURNAL=$(trueorfalse USE_JOURNAL False)
local pidstr=""
if [[ "$USE_JOURNAL" == "True" ]]; then
iniset $conf_file $conf_section use_journal "True"
# if we are using the journal directly, our process id is already correct
iniset $conf_file $conf_section logging_debug_format_suffix \
"{{%(funcName)s %(pathname)s:%(lineno)d}}"
else
iniset $conf_file $conf_section logging_debug_format_suffix \
"{{(pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d}}"
pidstr="(pid=%(process)d) "
fi
iniset $conf_file $conf_section logging_debug_format_suffix "{{${pidstr}%(funcName)s %(pathname)s:%(lineno)d}}"
iniset $conf_file $conf_section logging_context_format_string \
"%(levelname)s %(name)s [%(request_id)s %(project_name)s %(user_name)s] %(instance)s%(message)s"
iniset $conf_file $conf_section logging_default_format_string \
"%(levelname)s %(name)s [-] %(instance)s%(color)s%(message)s"
iniset $conf_file $conf_section logging_exception_prefix "ERROR %(name)s %(instance)s"
iniset $conf_file $conf_section logging_context_format_string "%(color)s%(levelname)s %(name)s [%(request_id)s %(project_name)s %(user_name)s%(color)s] %(instance)s%(color)s%(message)s"
iniset $conf_file $conf_section logging_default_format_string "%(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s"
iniset $conf_file $conf_section logging_exception_prefix "ERROR %(name)s %(instance)s"
}
function setup_standard_logging_identity {