1. devstack
  2. Commit da1cc5780d9501f5705a5e9844e819067514217f
Browse code

Remove microseconds from apache log(s)

Remove the microseconds from the apache logs and move back to using
milliseconds. There is no longer any 2.2 workarounds in the keystone
setup process.

Change-Id: I8787eee41fbde1f9794aeffe1e862af0d5117bc3

Morgan Fainberg authored on 2016/02/03 02:09:28
Showing 2 changed files
files/apache-keystone.template
History View file @ da1cc57
... ... 
@@ -3,13 +3,7 @@ Listen %ADMINPORT%
3 3 
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" keystone_combined
4 4
5 5 
 <Directory %KEYSTONE_BIN%>
6 
-    <IfVersion >= 2.4>
7 
-        Require all granted
8 
-    </IfVersion>
9 
-    <IfVersion < 2.4>
10 
-        Order allow,deny
11 
-        Allow from all
12 
-    </IfVersion>
6 
+    Require all granted
13 7 
 </Directory>
14 8
15 9 
 <VirtualHost *:%PUBLICPORT%>
... ... 
@@ -18,9 +12,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"
18 18 
     WSGIScriptAlias / %KEYSTONE_BIN%/keystone-wsgi-public
19 19 
     WSGIApplicationGroup %{GLOBAL}
20 20 
     WSGIPassAuthorization On
21 
-    <IfVersion >= 2.4>
22 
-      ErrorLogFormat "%{cu}t %M"
23 
-    </IfVersion>
21 
+    ErrorLogFormat "%M"
24 22 
     ErrorLog /var/log/%APACHE_NAME%/keystone.log
25 23 
     CustomLog /var/log/%APACHE_NAME%/keystone_access.log keystone_combined
26 24 
     %SSLENGINE%
... ... 
@@ -34,9 +26,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"
34 34 
     WSGIScriptAlias / %KEYSTONE_BIN%/keystone-wsgi-admin
35 35 
     WSGIApplicationGroup %{GLOBAL}
36 36 
     WSGIPassAuthorization On
37 
-    <IfVersion >= 2.4>
38 
-      ErrorLogFormat "%{cu}t %M"
39 
-    </IfVersion>
37 
+    ErrorLogFormat "%M"
40 38 
     ErrorLog /var/log/%APACHE_NAME%/keystone.log
41 39 
     CustomLog /var/log/%APACHE_NAME%/keystone_access.log keystone_combined
42 40 
     %SSLENGINE%
lib/keystone
History View file @ da1cc57
... ... 
@@ -299,11 +299,10 @@ function configure_keystone {
299 299 
     iniset $KEYSTONE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
300 300
301 301 
     if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
302 
-        # Eliminate the %(asctime)s.%(msecs)03d from the log format strings
303 
-        iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s"
304 
-        iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"
305 
-        iniset $KEYSTONE_CONF DEFAULT logging_debug_format_suffix "%(funcName)s %(pathname)s:%(lineno)d"
306 
-        iniset $KEYSTONE_CONF DEFAULT logging_exception_prefix "%(process)d TRACE %(name)s %(instance)s"
302 
+        iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s"
303 
+        iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"
304 
+        iniset $KEYSTONE_CONF DEFAULT logging_debug_format_suffix "%(asctime)s.%(msecs)03d %(funcName)s %(pathname)s:%(lineno)d"
305 
+        iniset $KEYSTONE_CONF DEFAULT logging_exception_prefix "%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s"
307 306 
         _config_keystone_apache_wsgi
308 307 
     else
309 308 
         iniset $KEYSTONE_CONF eventlet_server admin_bind_host "$KEYSTONE_ADMIN_BIND_HOST"