Browse Source

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
tags/8.0.0.0rc1
Erik Olof Gunnar Andersson 6 months ago
parent
commit
daa7d04951
1 changed files with 3 additions and 6 deletions
  1. 3
    6
      devstack/lib/magnum

+ 3
- 6
devstack/lib/magnum View File

@@ -175,16 +175,13 @@ function create_magnum_conf {
175 175
         iniset $MAGNUM_CONF oslo_concurrency lock_path "$MAGNUM_STATE_PATH"
176 176
     fi
177 177
 
178
-    if [ "$SYSLOG" != "False" ]; then
179
-        iniset $MAGNUM_CONF DEFAULT use_syslog "True"
178
+    if [ "$USE_SYSTEMD" != "False" ]; then
179
+        setup_systemd_logging $MAGNUM_CONF
180 180
     fi
181 181
 
182 182
     # Format logging
183
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
183
+    if [ "$LOG_COLOR" == "True" ] && [ "$USE_SYSTEMD" == "False" ]; then
184 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 185
     fi
189 186
 
190 187
     # Register SSL certificates if provided

Loading…
Cancel
Save