1. devstack
  2. Commit 2c2b1cccc93771dfaa5a520c9d9634e5af47a55e
Browse code

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

Morgan Fainberg authored on 2014/05/02 14:05:41
Showing 1 changed files
lib/keystone
History View file @ 2c2b1cc
... ... 
@@ -253,11 +253,17 @@ function configure_keystone {
253 253 
     fi
254 254
255 255 
     # Format logging
256 
-    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
256 
+    if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ] &&  ! is_apache_enabled_service key ; then
257 257 
         setup_colorized_logging $KEYSTONE_CONF DEFAULT
258 258 
     fi
259 259
260 260 
     if is_apache_enabled_service key; then
261 
+        iniset $KEYSTONE_CONF DEFAULT debug "True"
262 
+        # Eliminate the %(asctime)s.%(msecs)03d from the log format strings
263 
+        iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s"
264 
+        iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"
265 
+        iniset $KEYSTONE_CONF DEFAULT logging_debug_format_suffix "%(funcName)s %(pathname)s:%(lineno)d"
266 
+        iniset $KEYSTONE_CONF DEFAULT logging_exception_prefix "%(process)d TRACE %(name)s %(instance)s"
261 267 
         _config_keystone_apache_wsgi
262 268 
     fi
263 269 
 }