From b2b9bf5baf2ab0ebd596f134d3655f63cddd3aa3 Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Wed, 15 Aug 2018 17:12:50 -0700
Subject: [PATCH] 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 9448c3360dd8e2378ec73a3d695bb7b350a32e05)
(cherry picked from commit b1d0067159047ecc0503575af11cd5a4969c286d)
---
 devstack/plugin.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a3e89cd1dd..1de3377cb1 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -256,23 +256,9 @@ function configure_manila {
         iniset $MANILA_CONF DEFAULT osapi_share_listen_port $MANILA_SERVICE_PORT_INT
     fi
 
-    if [ "$SYSLOG" != "False" ]; then
-        iniset $MANILA_CONF DEFAULT use_syslog True
-    fi
-
     iniset_rpc_backend manila $MANILA_CONF DEFAULT
 
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
-        # Add color to logging output
-        iniset $MANILA_CONF DEFAULT logging_context_format_string \
-            "%(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"
-        iniset $MANILA_CONF DEFAULT logging_default_format_string \
-            "%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s"
-        iniset $MANILA_CONF DEFAULT logging_debug_format_suffix \
-            "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"
-        iniset $MANILA_CONF DEFAULT logging_exception_prefix \
-            "%(color)s%(asctime)s.%(msecs)d TRACE %(name)s %(instance)s"
-    fi
+    setup_logging $MANILA_CONF
 
     MANILA_CONFIGURE_GROUPS=${MANILA_CONFIGURE_GROUPS:-"$MANILA_ENABLED_BACKENDS"}
     set_config_opts $MANILA_CONFIGURE_GROUPS