openstack/devstack
Code Issues Proposed changes

Ensure that keystone uses global debug setting

Browse Source 
When setting ENABLE_DEBUG_LOG_LEVEL the keystone screen would ignore
this setting and always use the debug mode.

Change-Id: I934443c2976e936198fc93da4cca717e6cb84e6f
This commit is contained in:
Gary Kotton 2014-09-22 00:55:02 -07:00
parent 47ccb7fa36
commit 3fcd2baf95
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/keystone
View File

@ -283,7 +283,7 @@ function configure_keystone {
fi fi
if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
iniset $KEYSTONE_CONF DEFAULT debug "True" iniset $KEYSTONE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
# Eliminate the %(asctime)s.%(msecs)03d from the log format strings # Eliminate the %(asctime)s.%(msecs)03d from the log format strings
iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s" iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s"
iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s" iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"
@ -476,8 +476,12 @@ function start_keystone {
tail_log key /var/log/$APACHE_NAME/keystone.log tail_log key /var/log/$APACHE_NAME/keystone.log
tail_log key-access /var/log/$APACHE_NAME/keystone_access.log tail_log key-access /var/log/$APACHE_NAME/keystone_access.log
else else
local EXTRA_PARAMS=""
if [ "$ENABLE_DEBUG_LOG_LEVEL" == "True" ]; then
EXTRA_PARAMS="--debug"
fi
# Start Keystone in a screen window # Start Keystone in a screen window
run_process key "$KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF --debug" run_process key "$KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF $EXTRA_PARAMS"
fi fi
echo "Waiting for keystone to start..." echo "Waiting for keystone to start..."