|
...
|
...
|
@@ -309,8 +309,9 @@ function configure_keystone {
|
|
309
|
309
|
setup_colorized_logging $KEYSTONE_CONF DEFAULT
|
|
310
|
310
|
fi
|
|
311
|
311
|
|
|
|
312
|
+ iniset $KEYSTONE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
|
|
|
313
|
+
|
|
312
|
314
|
if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
|
|
313
|
|
- iniset $KEYSTONE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
|
|
314
|
315
|
# Eliminate the %(asctime)s.%(msecs)03d from the log format strings
|
|
315
|
316
|
iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s"
|
|
316
|
317
|
iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"
|
|
...
|
...
|
@@ -532,12 +533,8 @@ function start_keystone {
|
|
532
|
532
|
tail_log key /var/log/$APACHE_NAME/keystone.log
|
|
533
|
533
|
tail_log key-access /var/log/$APACHE_NAME/keystone_access.log
|
|
534
|
534
|
else
|
|
535
|
|
- local EXTRA_PARAMS=""
|
|
536
|
|
- if [ "$ENABLE_DEBUG_LOG_LEVEL" == "True" ]; then
|
|
537
|
|
- EXTRA_PARAMS="--debug"
|
|
538
|
|
- fi
|
|
539
|
535
|
# Start Keystone in a screen window
|
|
540
|
|
- run_process key "$KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF $EXTRA_PARAMS"
|
|
|
536
|
+ run_process key "$KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF"
|
|
541
|
537
|
fi
|
|
542
|
538
|
|
|
543
|
539
|
echo "Waiting for keystone to start..."
|