Browse Source

Merge "Remove logging overrides from plugin.sh" into stable/pike

Zuul 7 months ago
parent
commit
a61a245d43
1 changed files with 1 additions and 15 deletions
  1. 1
    15
      devstack/plugin.sh

+ 1
- 15
devstack/plugin.sh View File

@@ -252,23 +252,9 @@ function configure_manila {
252 252
         iniset $MANILA_CONF DEFAULT osapi_share_listen_port $MANILA_SERVICE_PORT_INT
253 253
     fi
254 254
 
255
-    if [ "$SYSLOG" != "False" ]; then
256
-        iniset $MANILA_CONF DEFAULT use_syslog True
257
-    fi
258
-
259 255
     iniset_rpc_backend manila $MANILA_CONF DEFAULT
260 256
 
261
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
262
-        # Add color to logging output
263
-        iniset $MANILA_CONF DEFAULT logging_context_format_string \
264
-            "%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [%(request_id)s %(user_id)s %(project_id)s%(color)s] %(instance)s%(color)s%(message)s"
265
-        iniset $MANILA_CONF DEFAULT logging_default_format_string \
266
-            "%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s"
267
-        iniset $MANILA_CONF DEFAULT logging_debug_format_suffix \
268
-            "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"
269
-        iniset $MANILA_CONF DEFAULT logging_exception_prefix \
270
-            "%(color)s%(asctime)s.%(msecs)d TRACE %(name)s %(instance)s"
271
-    fi
257
+    setup_logging $MANILA_CONF
272 258
 
273 259
     MANILA_CONFIGURE_GROUPS=${MANILA_CONFIGURE_GROUPS:-"$MANILA_ENABLED_BACKENDS"}
274 260
     set_config_opts $MANILA_CONFIGURE_GROUPS

Loading…
Cancel
Save