Bugfix: fix pymin.serializer test case import.

[software/pymin.git] / pymin / pymindaemon.py

diff --git a/pymin/pymindaemon.py b/pymin/pymindaemon.py
index e7275e0ad853ed5de6ddb5475abb89e6d99d1161..067a727e265b42cd629f53deaa71fad585bb1020 100644 (file)
--- a/pymin/pymindaemon.py
+++ b/pymin/pymindaemon.py
@@ -16,6 +16,7 @@ from pymin.dispatcher import handler
 from pymin import dispatcher
 from pymin import eventloop
 from pymin import serializer
 from pymin import dispatcher
 from pymin import eventloop
 from pymin import serializer

+from pymin import procman

 
 class PyminDaemon(eventloop.EventLoop):
     r"""PyminDaemon(root, bind_addr) -> PyminDaemon instance
 
 class PyminDaemon(eventloop.EventLoop):
     r"""PyminDaemon(root, bind_addr) -> PyminDaemon instance


@@ -43,34 +44,43 @@ class PyminDaemon(eventloop.EventLoop):
 
         See PyminDaemon class documentation for more info.
         """
 
         See PyminDaemon class documentation for more info.
         """

-        log.debug(u'PyminDaemon(%s.%s, %s, %s)', root.__class__.__module__,
-                  root.__class__.__name__, bind_addr, timer)
+        log.debug(u'PyminDaemon(%r, %r, %r)', root, bind_addr, timer)
+        # Timer timeout time
+        self.timer = timer

         # Create and bind socket
         sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind(bind_addr)
         # Create and bind socket
         sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind(bind_addr)

-        # Create EventLoop
-        eventloop.EventLoop.__init__(self, sock, timer=timer)
-        # Create Dispatcher
-        #TODO root.pymin = PyminHandler()
-        self.dispatcher = dispatcher.Dispatcher(root)

         # Signal handling
         # Signal handling

-        def quit(signum, frame):
-            log.debug(u'PyminDaemon quit() handler: signal %s', signum)
+        def quit(loop, signum):
+            log.debug(u'PyminDaemon quit() handler: signal %r', signum)

             log.info(u'Shutting down...')
             log.info(u'Shutting down...')

-            self.stop() # tell main event loop to stop
-        def reload_config(signum, frame):
-            log.debug(u'PyminDaemon reload_config() handler: signal %s', signum)
+            loop.stop() # tell main event loop to stop
+        def reload_config(loop, signum):
+            log.debug(u'PyminDaemon reload_config() handler: signal %r', signum)

             log.info(u'Reloading configuration...')
             # TODO iterate handlers list propagating reload action
             log.info(u'Reloading configuration...')
             # TODO iterate handlers list propagating reload action

-        signal.signal(signal.SIGINT, quit)
-        signal.signal(signal.SIGTERM, quit)
-        signal.signal(signal.SIGUSR1, reload_config)
+        def timer(loop, signum):
+            loop.handle_timer()
+            signal.alarm(loop.timer)
+        def child(loop, signum):
+            procman.sigchild_handler(signum)
+        # Create EventLoop
+        eventloop.EventLoop.__init__(self, sock, signals={
+                signal.SIGINT: quit,
+                signal.SIGTERM: quit,
+                signal.SIGUSR1: reload_config,
+                signal.SIGALRM: timer,
+                signal.SIGCHLD: child,
+            })
+        # Create Dispatcher
+        #TODO root.pymin = PyminHandler()
+        self.dispatcher = dispatcher.Dispatcher(root)

 
     def handle(self):
         r"handle() -> None :: Handle incoming events using the dispatcher."
         (msg, addr) = self.file.recvfrom(65535)
 
     def handle(self):
         r"handle() -> None :: Handle incoming events using the dispatcher."
         (msg, addr) = self.file.recvfrom(65535)

-        log.debug(u'PyminDaemon.handle: message %r from %s', msg, addr)
+        log.debug(u'PyminDaemon.handle: message %r from %r', msg, addr)

         try:
             result = self.dispatcher.dispatch(unicode(msg, 'utf-8'))
             if result is not None:
         try:
             result = self.dispatcher.dispatch(unicode(msg, 'utf-8'))
             if result is not None:


@@ -88,7 +98,7 @@ class PyminDaemon(eventloop.EventLoop):
             response += u'0\n'
         else:
             response += u'%d\n%s' % (len(result), result)
             response += u'0\n'
         else:
             response += u'%d\n%s' % (len(result), result)

-        log.debug(u'PyminDaemon.handle: response %r to %s', response, addr)
+        log.debug(u'PyminDaemon.handle: response %r to %r', response, addr)

         self.file.sendto(response.encode('utf-8'), addr)
 
     def handle_timer(self):
         self.file.sendto(response.encode('utf-8'), addr)
 
     def handle_timer(self):


@@ -98,6 +108,10 @@ class PyminDaemon(eventloop.EventLoop):
     def run(self):
         r"run() -> None :: Run the event loop (shortcut to loop())"
         log.debug(u'PyminDaemon.loop()')
     def run(self):
         r"run() -> None :: Run the event loop (shortcut to loop())"
         log.debug(u'PyminDaemon.loop()')

+        # Start the timer
+        self.handle_timer()
+        signal.alarm(self.timer)
+        # Loop

         try:
             return self.loop()
         except eventloop.LoopInterruptedError, e:
         try:
             return self.loop()
         except eventloop.LoopInterruptedError, e: