openstack/devstack
Code Issues Proposed changes

Restore log colors under devstack/systemd

Browse Source 
One of the pending issues with the conversion to systemd was the loss of
log coloring.  It turns out that journalctl by default strips out
characters it considers "unprintable" - including the color codes
emitted by the old-style logging.  However, journalctl can be made to
print them by adding the `-a` flag.

This change makes devstack's log formatter conf settings include color
codes like the old screen-based setup used to

We also remove stackrc's setting of JOURNALCTL_F, whose usage was
removed via I6af6d1857effaf662a9d72bd394864934eacbe70.

Change-Id: I2401e267913a24d18dae355aa933072dbbdab1d8
This commit is contained in:
Eric Fried
2017-05-16 13:52:03 -05:00
parent ac042d4122
commit 8cd310d763
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 {