Changeset 1644

Timestamp:

03/31/07 16:38:17

Author:

fumanchu

Message:

restsrv cosmetics

Files:

• trunk/cherrypy/restsrv/plugins.py (modified) (2 diffs)
• trunk/cherrypy/restsrv/restd.py (modified) (1 diff)
• trunk/cherrypy/restsrv/win32.py (modified) (3 diffs)

trunk/cherrypy/restsrv/plugins.py

@@ -54 +54 @@
-        # Make a map from signal numbers to names
-        self.signals = {}
- in dir
+, v in vars
-            if k.startswith('SIG') and not k.startswith('SIG_'):
-getattr(_signal, k)
+v
-        
-        self.engine = engine
@@ -77 +77 @@
-        # Should we do something with existing signal handlers?
-        # cur = _signal.getsignal(signum)
-
+_
-        if callback is not None:
-            self.engine.subscribe(signame, callback)
-    
-
+
+
-        self.engine.publish(self.signals[signum])
-

trunk/cherrypy/restsrv/restd.py

@@ -41 +41 @@
-
-
-def importer(name):
-    # Wrap the given 'name' in a closure.
-    def _import():
-        __import__(name, {}, {}, [''])
-    _import.priority = 20
-    return _import
-
-
-def start(opts):
-    if '--project' in opts:
-        # delay import until after daemonize has a chance to run
-
+
+
+
+
-    
-    if 'win' not in sys.platform:

trunk/cherrypy/restsrv/win32.py

@@ -16 +16 @@
-        base.Engine.__init__(self)
-        self.stop_event = win32event.CreateEvent(None, 0, 0, None)
-trol_handler
+sole_event
-    
-trol_handler
+sole_event
-        if event in (win32con.CTRL_C_EVENT,
-                     win32con.CTRL_BREAK_EVENT,
-                     win32con.CTRL_CLOSE_EVENT):
-trol
+sole
-            self.stop()
-            return 1
@@ -44 +44 @@
-            self.state = base.STOPPED
-
+
+class _ControlCodes(dict):
+    """Control codes used to "signal" a service via ControlService.
+    
+    User-defined control codes are in the range 128-255. We generally use
+    the standard Python value for the Linux signal and add 128. Example:
+    
+        >>> signal.SIGUSR1
+        10
+        control_codes['graceful'] = 128 + 10
+    """
+    
+    def key_for(self, obj):
+        """For the given value, return its corresponding key."""
+        for key, val in self.iteritems():
+            if val is obj:
+                return key
+        raise ValueError("The given object could not be found: %r" % obj)
+
+control_codes = _ControlCodes({'graceful': 138})
+
+
+def signal_child(service, command):
+    if command == 'stop':
+        win32serviceutil.StopService(service)
+    elif command == 'restart':
+        win32serviceutil.RestartService(service)
+    else:
+        win32serviceutil.ControlService(service, control_codes[command])
-
-
@@ -67 +96 @@
-        self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
-        restsrv.engine.stop()
+    
+    def SvcOther(self, control):
+        restsrv.engine.publish(control_codes.key_for(control))
+
-
-if __name__ == '__main__':