mod-wsgi-standalone 6.0.0.dev3__tar.gz → 6.0.0.dev4__tar.gz

{mod_wsgi_standalone-6.0.0.dev3 → mod_wsgi_standalone-6.0.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi-standalone
-Version: 6.0.0.dev3
+Version: 6.0.0.dev4
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton

{mod_wsgi_standalone-6.0.0.dev3 → mod_wsgi_standalone-6.0.0.dev4}/mod_wsgi_standalone.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi-standalone
-Version: 6.0.0.dev3
+Version: 6.0.0.dev4
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton

{mod_wsgi_standalone-6.0.0.dev3 → mod_wsgi_standalone-6.0.0.dev4}/src/express/apache.py

@@ -317,6 +317,10 @@ WSGISlowRequests %(slow_requests)s
 WSGISwitchInterval %(switch_interval)s
 </IfDefine>
 
+<IfDefine MOD_WSGI_FREE_THREADING>
+WSGIFreeThreading On
+</IfDefine>
+
 <IfDefine MOD_WSGI_TELEMETRY_OPTIONS>
 %(telemetry_options)s
 </IfDefine>

{mod_wsgi_standalone-6.0.0.dev3 → mod_wsgi_standalone-6.0.0.dev4}/src/express/options.py

@@ -540,10 +540,25 @@ add_option('all', '--telemetry-service', metavar='TARGET',
         'ingester). Remote "udp:host:port" targets are not supported. '
         'Off by default.')
 
+add_option('unix', '--enable-telemetry', action='store_true', default=False,
+        help='Bundle a telemetry ingester and web UI alongside the WSGI '
+        'application. Generates a service-script daemon that runs the '
+        'mod_wsgi-telemetry ingester on a UNIX socket inside the server '
+        'root and emits WSGITelemetryService pointing at that socket so '
+        'the WSGI processes report to it. Requires the mod_wsgi-telemetry '
+        'package to be installed. Mutually exclusive with '
+        '--telemetry-service.')
+
+add_option('unix', '--telemetry-ui-port', type='int', default=8888,
+        metavar='NUMBER', help='HTTP port the telemetry web UI binds to '
+        'on 127.0.0.1 when --enable-telemetry is set. Defaults to '
+        '%default. Two express instances on the same host need distinct '
+        'ports to avoid a bind collision.')
+
 add_option('all', '--telemetry-interval', type='float', default=1.0,
         metavar='SECONDS', help='Metrics reporter sampling interval '
-        'in seconds. Only applies when --telemetry-service is set. '
-        'Defaults to %default.')
+        'in seconds. Only applies when --telemetry-service or '
+        '--enable-telemetry is set. Defaults to %default.')
 
 add_option('all', '--slow-requests', type='float', default=None,
         metavar='SECONDS', help='Enable slow-request reporting and set '
@@ -558,6 +573,13 @@ add_option('all', '--switch-interval', type='float', default=None,
         'switch-interval option on WSGIDaemonProcess. Defaults to '
         'Python\'s built-in 0.005 (5 ms) when unset.')
 
+add_option('all', '--free-threading', action='store_true', default=False,
+        help='Emit WSGIFreeThreading On in the generated configuration to '
+        'run the Python interpreter without the GIL. Requires a Python '
+        'build with free-threading support (PEP 703, --disable-gil); '
+        'mod_wsgi-express will exit with an error if the running Python '
+        'does not support it.')
+
 add_option('all', '--telemetry-options', action='append', default=[],
         metavar='ARGS', help='Apache-Options-style metrics-capture '
         'toggle, passed verbatim to a WSGITelemetryOptions directive in '

{mod_wsgi_standalone-6.0.0.dev3 → mod_wsgi_standalone-6.0.0.dev4}/src/express/scripts.py

@@ -166,6 +166,27 @@ def generate_wsgi_handler_script(options):
     with open(path, 'w') as fp:
         print(WSGI_DEFAULT_SCRIPT % options, file=fp)
 
+TELEMETRY_SERVICE_SCRIPT = '''
+# Auto-generated by mod_wsgi-express --enable-telemetry. Runs the
+# mod_wsgi-telemetry ingester and web UI inside a WSGIDaemonProcess
+# threads=0 service daemon. The WSGI processes report to the UNIX
+# socket below via the WSGITelemetryService directive in httpd.conf.
+
+from mod_wsgi.telemetry.server import main
+
+main([
+    "--listen",    "unix:%(telemetry_socket)s",
+    "--http-host", "127.0.0.1",
+    "--http-port", "%(telemetry_ui_port)s",
+    "--log-level", "INFO",
+])
+'''
+
+def generate_telemetry_service_script(options):
+    path = os.path.join(options['server_root'], 'telemetry-service.py')
+    with open(path, 'w') as fp:
+        print(TELEMETRY_SERVICE_SCRIPT % options, file=fp)
+
 WSGI_CONTROL_SCRIPT = """
 #!%(shell_executable)s
 

{mod_wsgi_standalone-6.0.0.dev3 → mod_wsgi_standalone-6.0.0.dev4}/src/express/server.py

@@ -5,12 +5,16 @@ import math
 import os
 import posixpath
 import sys
+import sysconfig
 import tempfile
 
 from . import apxs_config
 from .platform import find_program, MOD_WSGI_SO, PYTHON_DYLIB
 from .apache import generate_apache_config
-from .scripts import generate_wsgi_handler_script, generate_control_scripts
+from .scripts import (
+    generate_wsgi_handler_script, generate_control_scripts,
+    generate_telemetry_service_script,
+)
 
 def _mpm_module_defines(modules_directory, preferred=None):
     if os.name == 'nt':
@@ -367,6 +371,41 @@ def setup_server(command, args, options):
     else:
         options['server_metrics_flag'] = 'Off'
 
+    if options['enable_telemetry']:
+        if options['telemetry_service']:
+            raise ConfigurationError(
+                "--enable-telemetry and --telemetry-service are "
+                "mutually exclusive: --enable-telemetry generates an "
+                "ingester service and points the WSGI processes at "
+                "it, so an explicit telemetry target would conflict.")
+
+        try:
+            import mod_wsgi.telemetry.server  # noqa: F401
+        except ImportError:
+            raise ConfigurationError(
+                "--enable-telemetry requires the mod_wsgi-telemetry "
+                "package: install it with "
+                "'pip install mod_wsgi-telemetry'.")
+
+        for name, _ in options['service_scripts'] or []:
+            if name == 'telemetry':
+                raise ConfigurationError(
+                    "--enable-telemetry generates a service named "
+                    "'telemetry'; rename the conflicting "
+                    "--service-script entry or drop "
+                    "--enable-telemetry.")
+
+        socket_path = posixpath.join(options['server_root'],
+                                     'telemetry.sock')
+        options['telemetry_socket'] = socket_path
+        options['telemetry_service'] = 'unix:%s' % socket_path
+
+        script_path = posixpath.join(options['server_root'],
+                                     'telemetry-service.py')
+        options['service_scripts'] = list(
+            options['service_scripts'] or [])
+        options['service_scripts'].append(('telemetry', script_path))
+
     if options['telemetry_service']:
         target = options['telemetry_service']
         if not target.startswith('unix:'):
@@ -396,6 +435,13 @@ def setup_server(command, args, options):
         options['switch_interval'] = ''
         options['daemon_switch_interval_option'] = ''
 
+    if options['free_threading']:
+        if not sysconfig.get_config_var('Py_GIL_DISABLED'):
+            raise ConfigurationError(
+                "--free-threading requires a Python build with "
+                "free-threading support (PEP 703). Rebuild Python "
+                "with --disable-gil to use it.")
+
     if options['handler_scripts']:
         handler_scripts = []
         for extension, script in options['handler_scripts']:
@@ -781,6 +827,8 @@ def setup_server(command, args, options):
         options['httpd_arguments_list'].append('-DMOD_WSGI_SLOW_REQUESTS')
     if options['switch_interval'] != '':
         options['httpd_arguments_list'].append('-DMOD_WSGI_SWITCH_INTERVAL')
+    if options['free_threading']:
+        options['httpd_arguments_list'].append('-DMOD_WSGI_FREE_THREADING')
     if options['telemetry_options']:
         options['httpd_arguments_list'].append('-DMOD_WSGI_TELEMETRY_OPTIONS')
         options['telemetry_options'] = '\n'.join(
@@ -856,6 +904,9 @@ def setup_server(command, args, options):
 
     generate_wsgi_handler_script(options)
 
+    if options['enable_telemetry']:
+        generate_telemetry_service_script(options)
+
     print('Server URL         :', options['url'])
 
     if options['https_url']:

{mod_wsgi_standalone-6.0.0.dev3 → mod_wsgi_standalone-6.0.0.dev4}/src/server/wsgi_daemon.c

@@ -2991,9 +2991,15 @@ static void wsgi_daemon_main(apr_pool_t *p, WSGIDaemonProcess *daemon)
         }
     }
 
-    /* Start telemetry reporter if configured. */
+    /*
+     * Start telemetry reporter if configured. Skip for service-script
+     * daemons (threads=0): they handle no requests, so there is
+     * nothing to accumulate, and an ingester-hosting service script
+     * would otherwise report telemetry datagrams to itself.
+     */
 
-    wsgi_telemetry_start_reporter(p);
+    if (daemon->group->threads != 0)
+        wsgi_telemetry_start_reporter(p);
 
     /* Initialise worker stack. */
 

{mod_wsgi_standalone-6.0.0.dev3 → mod_wsgi_standalone-6.0.0.dev4}/src/server/wsgi_version.h

@@ -26,7 +26,7 @@
 #define MOD_WSGI_MAJORVERSION_NUMBER 6
 #define MOD_WSGI_MINORVERSION_NUMBER 0
 #define MOD_WSGI_MICROVERSION_NUMBER 0
-#define MOD_WSGI_VERSION_STRING "6.0.0.dev3"
+#define MOD_WSGI_VERSION_STRING "6.0.0.dev4"
 
 /* ------------------------------------------------------------------------- */