Browse code

Merge "Keystone use common logging setup"

Jenkins authored on 2014/01/26 03:40:53
Showing 1 changed files
... ...
@@ -245,14 +245,14 @@ function configure_keystone() {
245 245
     fi
246 246
 
247 247
     # Set up logging
248
-    LOGGING_ROOT="devel"
249 248
     if [ "$SYSLOG" != "False" ]; then
250
-        LOGGING_ROOT="$LOGGING_ROOT,production"
249
+        iniset $KEYSTONE_CONF DEFAULT use_syslog "True"
250
+    fi
251
+
252
+    # Format logging
253
+    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
254
+        setup_colorized_logging $KEYSTONE_CONF DEFAULT
251 255
     fi
252
-    KEYSTONE_LOG_CONFIG="--log-config $KEYSTONE_CONF_DIR/logging.conf"
253
-    cp $KEYSTONE_DIR/etc/logging.conf.sample $KEYSTONE_CONF_DIR/logging.conf
254
-    iniset $KEYSTONE_CONF_DIR/logging.conf logger_root level "DEBUG"
255
-    iniset $KEYSTONE_CONF_DIR/logging.conf logger_root handlers "devel,production"
256 256
 
257 257
     if is_apache_enabled_service key; then
258 258
         _config_keystone_apache_wsgi
... ...
@@ -410,7 +410,7 @@ function start_keystone() {
410 410
         screen_it key "cd $KEYSTONE_DIR && sudo tail -f /var/log/$APACHE_NAME/keystone"
411 411
     else
412 412
         # Start Keystone in a screen window
413
-        screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF $KEYSTONE_LOG_CONFIG --debug"
413
+        screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF --debug"
414 414
     fi
415 415
 
416 416
     echo "Waiting for keystone to start..."