commit 2c2b1cccc93771dfaa5a520c9d9634e5af47a55e
author Morgan Fainberg <m@metacloud.com> Thu May 01 22:05:41 2014 -0700
committer Morgan Fainberg <m@metacloud.com> Fri May 02 05:12:21 2014 +0000
tree 2e0f62c37b82a75b1a83c13e15ad12167d064f3c
parent 020d8611d504684c84bd76f9dbbd214f45d1e515

Fix logging for keystone under mod_wsgi

When Keystone is configured under mod_wsgi, Keystone configuration 
requires debugging to be enabled as the debug flag cannot be passed
via cli arguments.

Because Apache 2.2 (default for a number of distributions) does not 
support passing an explicit format to the ErrorLog, Keystone under 
mod_wsgi ends up with duplicated timestamps in the Keystone log. 
This patchset eliminates the %(asctime) and %(msecs) substitution 
targets from the log format options when Keystone is configured 
under mod_wsgi.

Change-Id: I0bf32db6e53cb653921162cb1957eb988b819815

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index b31cc57..5f9c57e 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -253,11 +253,17 @@
     fi
 
     # Format logging
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
+    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] &&  ! is_apache_enabled_service key ; then
         setup_colorized_logging $KEYSTONE_CONF DEFAULT
     fi
 
     if is_apache_enabled_service key; then
+        iniset $KEYSTONE_CONF DEFAULT debug "True"
+        # 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_default_format_string "%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"
+        iniset $KEYSTONE_CONF DEFAULT logging_debug_format_suffix "%(funcName)s %(pathname)s:%(lineno)d"
+        iniset $KEYSTONE_CONF DEFAULT logging_exception_prefix "%(process)d TRACE %(name)s %(instance)s"
         _config_keystone_apache_wsgi
     fi
 }