unify logging setup on all services
This provides a single setup_logging function which builds consistent
colorization if the config supports it, otherwise builds the identity
strings that we need to actually keep track of requests.
Change-Id: Iffe30326a5b974ad141aed6288f61e0d6fd18ca9
diff --git a/lib/nova b/lib/nova
index 617cf5c..c47f81a 100644
--- a/lib/nova
+++ b/lib/nova
@@ -519,12 +519,8 @@
iniset $NOVA_CONF DEFAULT force_config_drive "$FORCE_CONFIG_DRIVE"
fi
# Format logging
- if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] && [ "$NOVA_USE_MOD_WSGI" == "False" ] ; then
- setup_colorized_logging $NOVA_CONF
- else
- # Show user_name and project_name instead of user_id and project_id
- iniset $NOVA_CONF DEFAULT logging_user_identity_format "%(user_name)s %(project_name)s"
- fi
+ setup_logging $NOVA_CONF $NOVA_USE_MOD_WSGI
+
if [ "$NOVA_USE_MOD_WSGI" == "True" ]; then
_config_nova_apache_wsgi
fi