Browse code

Make the log output pretty and more useful

* requires https://review.openstack.org/#/c/8067/

Change-Id: Ib26c1bd7e9ef933a7dbe2ee0c476e8d439e17574

Vishvananda Ishaya authored on 2012/06/02 08:17:38
Showing 1 changed files
... ...
@@ -262,6 +262,9 @@ SYSLOG=`trueorfalse False $SYSLOG`
262 262
 SYSLOG_HOST=${SYSLOG_HOST:-$HOST_IP}
263 263
 SYSLOG_PORT=${SYSLOG_PORT:-516}
264 264
 
265
+# Use color for logging output
266
+LOG_COLOR=`trueorfalse True $LOG_COLOR`
267
+
265 268
 # Service startup timeout
266 269
 SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
267 270
 
... ...
@@ -1709,6 +1712,16 @@ fi
1709 1709
 if [ "$API_RATE_LIMIT" != "True" ]; then
1710 1710
     add_nova_opt "api_rate_limit=False"
1711 1711
 fi
1712
+if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
1713
+    # Add color to logging output
1714
+    add_nova_opt "logging_context_format_string=%(asctime)s %(color)s%(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s%(color)s] %(instance)s%(color)s%(message)s"
1715
+    add_nova_opt "logging_default_format_string=%(asctime)s %(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s"
1716
+    add_nova_opt "logging_debug_format_suffix=from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d"
1717
+    add_nova_opt "logging_exception_prefix=%(color)s%(asctime)s TRACE %(name)s %(instance)s"
1718
+else
1719
+    # Show user_name and project_name instead of user_id and project_id
1720
+    add_nova_opt "logging_context_format_string=%(asctime)s %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
1721
+fi
1712 1722
 
1713 1723
 
1714 1724
 # Provide some transition from EXTRA_FLAGS to EXTRA_OPTS