Browse code

Merge "Simplify oslo.log configuration options"

Jenkins authored on 2016/01/28 09:22:00
Showing 2 changed files
... ...
@@ -963,7 +963,7 @@ function _configure_neutron_common {
963 963
         setup_colorized_logging $NEUTRON_CONF DEFAULT project_id
964 964
     else
965 965
         # Show user_name and project_name by default like in nova
966
-        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"
966
+        iniset $NEUTRON_CONF DEFAULT logging_user_identity_format "%(user_name)s %(project_name)s"
967 967
     fi
968 968
 
969 969
     if is_service_enabled tls-proxy; then
... ...
@@ -546,7 +546,7 @@ function create_nova_conf {
546 546
         setup_colorized_logging $NOVA_CONF DEFAULT
547 547
     else
548 548
         # Show user_name and project_name instead of user_id and project_id
549
-        iniset $NOVA_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"
549
+        iniset $NOVA_CONF DEFAULT logging_user_identity_format "%(user_name)s %(project_name)s"
550 550
     fi
551 551
     if [ "$NOVA_USE_MOD_WSGI" == "True" ]; then
552 552
         _config_nova_apache_wsgi