Merge branch 'release/4.5.0'

Author: GrahamDumpleton

docs/release-notes.rst

@@ -5,6 +5,8 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.0
+
    release-notes/version-4.4.23
    release-notes/version-4.4.22
    release-notes/version-4.4.21

docs/release-notes/version-4.5.0.rst

@@ -0,0 +1,16 @@
+=============
+Version 4.5.0
+=============
+
+Version 4.5.0 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.0
+
+New Features
+------------
+
+1. Added additional internal performance monitoring features, included per
+   request event mechanism for getting extended metrics on a per request
+   basis. This includes details like per request CPU burn, which along with
+   process level CPU burn and thread utilisation can be used to better tune
+   processes/threads settings.

src/server/__init__.py

@@ -310,7 +310,7 @@ def find_mimetypes():
    receive-buffer-size=%(receive_buffer_size)s \\
    header-buffer-size=%(header_buffer_size)s \\
    response-buffer-size=%(response_buffer_size)s \\
-   server-metrics=%(daemon_server_metrics_flag)s
+   server-metrics=%(server_metrics_flag)s
 </IfDefine>
 <IfDefine !MOD_WSGI_MULTIPROCESS>
 WSGIDaemonProcess %(host)s:%(port)s \\
@@ -335,7 +335,7 @@ def find_mimetypes():
    send-buffer-size=%(send_buffer_size)s \\
    receive-buffer-size=%(receive_buffer_size)s \\
    response-buffer-size=%(response_buffer_size)s \\
-   server-metrics=%(daemon_server_metrics_flag)s
+   server-metrics=%(server_metrics_flag)s
 </IfDefine>
 </IfDefine>
 
@@ -351,6 +351,8 @@ def find_mimetypes():
 ExtendedStatus On
 </IfDefine>
 
+WSGIServerMetrics %(server_metrics_flag)s
+
 <IfDefine MOD_WSGI_SERVER_STATUS>
 <Location /server-status>
     SetHandler server-status
@@ -839,7 +841,8 @@ def find_mimetypes():
     python-path='%(python_path)s' \\
     python-eggs='%(python_eggs)s' \\
     lang='%(lang)s' \\
-    locale='%(locale)s'
+    locale='%(locale)s' \\
+    server-metrics=%(server_metrics_flag)s
 WSGIImportScript '%(script)s' \\
     process-group='service:%(name)s' \\
     application-group=%%{GLOBAL}
@@ -863,7 +866,8 @@ def find_mimetypes():
     python-path='%(python_path)s' \\
     python-eggs='%(python_eggs)s' \\
     lang='%(lang)s' \\
-    locale='%(locale)s'
+    locale='%(locale)s' \\
+    server-metrics=%(server_metrics_flag)s
 WSGIImportScript '%(script)s' \\
     process-group='service:%(name)s' \\
     application-group=%%{GLOBAL}
@@ -967,15 +971,17 @@ def generate_apache_config(options):
                             python_path=options['python_path'],
                             working_directory=options['working_directory'],
                             python_eggs=options['python_eggs'],
-                            lang=options['lang'], locale=options['locale']),
+                            lang=options['lang'], locale=options['locale'],
+                            server_metrics_flag=options['server_metrics_flag']),
                             file=fp)
                 else:
                     print(APACHE_SERVICE_CONFIG % dict(name=name, user=user,
                             group=group, script=script,
                             python_path=options['python_path'],
                             working_directory=options['working_directory'],
                             python_eggs=options['python_eggs'],
-                            lang=options['lang'], locale=options['locale']),
+                            lang=options['lang'], locale=options['locale'],
+                            server_metrics_flag=options['server_metrics_flag']),
                             file=fp)
 
         if options['include_files']:
@@ -2679,9 +2685,9 @@ def _cmd_setup_server(command, args, options):
     options['request_read_timeout'] = request_read_timeout
 
     if options['server_metrics']:
-        options['daemon_server_metrics_flag'] = 'On'
+        options['server_metrics_flag'] = 'On'
     else:
-        options['daemon_server_metrics_flag'] = 'Off'
+        options['server_metrics_flag'] = 'Off'
 
     if options['handler_scripts']:
         handler_scripts = []