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 commit9448c3360d
) (cherry picked from commitb1d0067159
) (cherry picked from commitb2b9bf5baf
) (cherry picked from commit2ba3a268e7
)
This commit is contained in:
parent
81b62fac0d
commit
f4f960b9ac
|
@ -237,23 +237,9 @@ function configure_manila {
|
||||||
iniset $MANILA_CONF DEFAULT osapi_share_listen_port $MANILA_SERVICE_PORT_INT
|
iniset $MANILA_CONF DEFAULT osapi_share_listen_port $MANILA_SERVICE_PORT_INT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$SYSLOG" != "False" ]; then
|
|
||||||
iniset $MANILA_CONF DEFAULT use_syslog True
|
|
||||||
fi
|
|
||||||
|
|
||||||
iniset_rpc_backend manila $MANILA_CONF DEFAULT
|
iniset_rpc_backend manila $MANILA_CONF DEFAULT
|
||||||
|
|
||||||
if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
|
setup_logging $MANILA_CONF
|
||||||
# Add color to logging output
|
|
||||||
iniset $MANILA_CONF DEFAULT logging_context_format_string \
|
|
||||||
"%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [[01;36m%(request_id)s [00;36m%(user_id)s %(project_id)s%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m"
|
|
||||||
iniset $MANILA_CONF DEFAULT logging_default_format_string \
|
|
||||||
"%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [[00;36m-%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m"
|
|
||||||
iniset $MANILA_CONF DEFAULT logging_debug_format_suffix \
|
|
||||||
"[00;33mfrom (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d[00m"
|
|
||||||
iniset $MANILA_CONF DEFAULT logging_exception_prefix \
|
|
||||||
"%(color)s%(asctime)s.%(msecs)d TRACE %(name)s [01;35m%(instance)s[00m"
|
|
||||||
fi
|
|
||||||
|
|
||||||
MANILA_CONFIGURE_GROUPS=${MANILA_CONFIGURE_GROUPS:-"$MANILA_ENABLED_BACKENDS"}
|
MANILA_CONFIGURE_GROUPS=${MANILA_CONFIGURE_GROUPS:-"$MANILA_ENABLED_BACKENDS"}
|
||||||
set_config_opts $MANILA_CONFIGURE_GROUPS
|
set_config_opts $MANILA_CONFIGURE_GROUPS
|
||||||
|
|
Loading…
Reference in New Issue