Browse code

Merge "Fix logging when under systemd"

Jenkins authored on 2017/05/05 05:31:41
Showing 2 changed files
... ...
@@ -267,9 +267,7 @@ function configure_keystone {
267 267
     fi
268 268
 
269 269
     # Format logging
270
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$KEYSTONE_DEPLOY" != "mod_wsgi" ] ; then
271
-        setup_colorized_logging $KEYSTONE_CONF
272
-    fi
270
+    setup_logging $KEYSTONE_CONF
273 271
 
274 272
     iniset $KEYSTONE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
275 273
 
... ...
@@ -231,12 +231,7 @@ function configure_neutron_new {
231 231
     fi
232 232
 
233 233
     # Format logging
234
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
235
-        setup_colorized_logging $NEUTRON_CONF DEFAULT project_id
236
-    else
237
-        # Show user_name and project_name by default
238
-        iniset $NEUTRON_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"
239
-    fi
234
+    setup_logging $NEUTRON_CONF
240 235
 
241 236
     if is_service_enabled tls-proxy; then
242 237
         # Set the service port for a proxy to take the original