summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Olof Gunnar Andersson <eandersson@blizzard.com>2018-11-05 14:27:16 -0800
committerErik Olof Gunnar Andersson <eandersson@blizzard.com>2018-11-06 17:16:28 +0000
commitdaa7d0495119f02abfe53142ca237a4084db5297 (patch)
treefe42cfafe935b6c5e1126155495f7e5552fe980b
parent83fa9d1b4e4ec764896e13d95587dbe3094e92ab (diff)
Cleaned up devstack logging
Switch to systemd logging to take advantage of some of the newer logging features. Story: 2004272 Task: 27820 Change-Id: I475bf26e24b3a725f68c7da355807374bf1e189b
Notes
Notes (review): Code-Review+1: Jim Bach <jabach@blizzard.com> Code-Review+2: Spyros Trigazis <strigazi@gmail.com> Workflow+1: Spyros Trigazis <strigazi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 08 Nov 2018 10:44:51 +0000 Reviewed-on: https://review.openstack.org/615682 Project: openstack/magnum Branch: refs/heads/master
-rw-r--r--devstack/lib/magnum9
1 files changed, 3 insertions, 6 deletions
diff --git a/devstack/lib/magnum b/devstack/lib/magnum
index 79bc90d..964e87c 100644
--- a/devstack/lib/magnum
+++ b/devstack/lib/magnum
@@ -175,16 +175,13 @@ function create_magnum_conf {
175 iniset $MAGNUM_CONF oslo_concurrency lock_path "$MAGNUM_STATE_PATH" 175 iniset $MAGNUM_CONF oslo_concurrency lock_path "$MAGNUM_STATE_PATH"
176 fi 176 fi
177 177
178 if [ "$SYSLOG" != "False" ]; then 178 if [ "$USE_SYSTEMD" != "False" ]; then
179 iniset $MAGNUM_CONF DEFAULT use_syslog "True" 179 setup_systemd_logging $MAGNUM_CONF
180 fi 180 fi
181 181
182 # Format logging 182 # Format logging
183 if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then 183 if [ "$LOG_COLOR" == "True" ] && [ "$USE_SYSTEMD" == "False" ]; then
184 setup_colorized_logging $MAGNUM_CONF DEFAULT 184 setup_colorized_logging $MAGNUM_CONF DEFAULT
185 else
186 # Show user_name and project_name instead of user_id and project_id
187 iniset $MAGNUM_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
188 fi 185 fi
189 186
190 # Register SSL certificates if provided 187 # Register SSL certificates if provided