Changeset 2022

Timestamp:

07/22/08 11:16:58

Author:

georgem

Message:

Override _installSignalHandlers for flup servers so they don't try to
install handlers (which causes errors in Linux). Added FlupSCGIServer to
servers.py. Add to the front of sys.path in cherryd so modules in the
currect directory can be imported in Linux. Added scgi support to
cherryd.

Files:

• trunk/cherrypy/cherryd (modified) (5 diffs)
• trunk/cherrypy/process/servers.py (modified) (2 diffs)

trunk/cherrypy/cherryd

@@ -9 +9 @@
-
-def start(configfiles=None, daemonize=False, environment=None,
-
+scgi=False, 
-    """Subscribe all engine plugins and start the engine."""
+    sys.path = [''] + sys.path
-    for i in imports or []:
-        exec "import %s" % i
@@ -36 +37 @@
-        engine.console_control_handler.subscribe()
-    
-
-
+
+
+
+
+
+
-        cherrypy.config.update({'engine.autoreload_on': False})
-        
@@ -46 +51 @@
-            bindAddress = sock_file
-        else:
-
-
-
-
+
+
+
+
+
+
+
-        s = servers.ServerAdapter(engine, httpserver=f, bind_addr=bindAddress)
-        s.subscribe()
@@ -75 +83 @@
-    p.add_option('-f', action="store_true", dest='fastcgi',
-                 help="start a fastcgi server instead of the default HTTP server")
+    p.add_option('-s', action="store_true", dest='scgi',
+                 help="start a scgi server instead of the default HTTP server")
-    p.add_option('-i', '--import', action="append", dest='imports',
-                 help="specify modules to import")
@@ -82 +92 @@
-    
-    start(options.config, options.daemonize,
-
+scgi, options.
-          options.imports)
-

trunk/cherrypy/process/servers.py

@@ -136 +136 @@
-        #     for signum,handler in self._oldSIGs:
-        #   AttributeError: 'WSGIServer' object has no attribute '_oldSIGs'
+        self.fcgiserver._installSignalHandlers = lambda: None
-        self.fcgiserver._oldSIGs = []
-        self.ready = False
@@ -151 +152 @@
-        # Force all worker threads to die off.
-        self.fcgiserver._threadPool.maxSpare = 0
+
+
+class FlupSCGIServer(object):
+    """Adapter for a flup.server.scgi.WSGIServer."""
+    
+    def __init__(self, *args, **kwargs):
+        from flup.server.scgi import WSGIServer
+        self.scgiserver = WSGIServer(*args, **kwargs)
+        # TODO: report this bug upstream to flup.
+        # If we don't set _oldSIGs on Windows, we get:
+        #   File "C:\Python24\Lib\site-packages\flup\server\threadedserver.py",
+        #   line 108, in run
+        #     self._restoreSignalHandlers()
+        #   File "C:\Python24\Lib\site-packages\flup\server\threadedserver.py",
+        #   line 156, in _restoreSignalHandlers
+        #     for signum,handler in self._oldSIGs:
+        #   AttributeError: 'WSGIServer' object has no attribute '_oldSIGs'
+        self.scgiserver._installSignalHandlers = lambda: None
+        self.scgiserver._oldSIGs = []
+        self.ready = False
+    
+    def start(self):
+        """Start the SCGI server."""
+        self.ready = True
+        self.scgiserver.run()
+    
+    def stop(self):
+        """Stop the HTTP server."""
+        self.ready = False
+        # Forcibly stop the scgi server main event loop.
+        self.scgiserver._keepGoing = False
+        # Force all worker threads to die off.
+        self.scgiserver._threadPool.maxSpare = 0
-
-