Browse Source

Remove logging overrides from plugin.sh

Avoid overwriting the log formatters, reuse
the helper available in Devstack.

Closes-Bug: #1787310
Change-Id: I25eb16ea9a6e3e98de6a7ee349df17438847d601
(cherry picked from commit 9448c3360d)
(cherry picked from commit b1d0067159)
(cherry picked from commit b2b9bf5baf)
(cherry picked from commit 2ba3a268e7)
Goutham Pacha Ravi 9 months ago
parent
commit
f4f960b9ac
1 changed files with 1 additions and 15 deletions
  1. 1
    15
      devstack/plugin.sh

+ 1
- 15
devstack/plugin.sh View File

@@ -237,23 +237,9 @@ function configure_manila {
237 237
         iniset $MANILA_CONF DEFAULT osapi_share_listen_port $MANILA_SERVICE_PORT_INT
238 238
     fi
239 239
 
240
-    if [ "$SYSLOG" != "False" ]; then
241
-        iniset $MANILA_CONF DEFAULT use_syslog True
242
-    fi
243
-
244 240
     iniset_rpc_backend manila $MANILA_CONF DEFAULT
245 241
 
246
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
247
-        # Add color to logging output
248
-        iniset $MANILA_CONF DEFAULT logging_context_format_string \
249
-            "%(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"
250
-        iniset $MANILA_CONF DEFAULT logging_default_format_string \
251
-            "%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s"
252
-        iniset $MANILA_CONF DEFAULT logging_debug_format_suffix \
253
-            "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"
254
-        iniset $MANILA_CONF DEFAULT logging_exception_prefix \
255
-            "%(color)s%(asctime)s.%(msecs)d TRACE %(name)s %(instance)s"
256
-    fi
242
+    setup_logging $MANILA_CONF
257 243
 
258 244
     MANILA_CONFIGURE_GROUPS=${MANILA_CONFIGURE_GROUPS:-"$MANILA_ENABLED_BACKENDS"}
259 245
     set_config_opts $MANILA_CONFIGURE_GROUPS

Loading…
Cancel
Save