Changeset 381 for trunk

Timestamp:

07/06/10 09:45:47 (11 years ago)

Author:

sander

Message:

Add Debian init.d script and signal handlers for use with start-stop-daemon

Location:

trunk/factory

Files:

• conf/config.default.ini (modified) (1 diff)
• src/daemon.py (modified) (2 diffs)
• src/factory.py (modified) (2 diffs)
• utils/officeshots-factory (added)

trunk/factory/conf/config.default.ini

@@ -8 +8 @@
 log_format = %(asctime)s %(levelname)s: %(message)s
 
+daemon = true
 pidfile = /var/run/officeshots.pid
 

trunk/factory/src/daemon.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
-import sys, os, time, atexit
+import sys, os, time, signal
 from signal import SIGTERM 
 
@@ -57 +57 @@
         
                 # write pidfile
-                atexit.register(self.delpid)
                 pid = str(os.getpid())
                 file(self.pidfile,'w+').write("%s\n" % pid)
+
+                # Install signal handler
+                signal.signal(signal.SIGTERM, self.sigterm)
+                signal.signal(signal.SIGHUP, self.sighup)
         
-        def delpid(self):
+        def sigterm(self, signum, frame):
+                """
+                Handle SIGTERN
+                """
                 os.remove(self.pidfile)
+                sys.exit()
+        
+        def sighup(self, signum, frame):
+                """
+                Handle SIGHUP
+                """
+                pass
 
         def start(self):

trunk/factory/src/factory.py

@@ -257 +257 @@
                 return True
 
+        def sigterm(self, signum, frame):
+                logging.info('Stopping factory server.')
+                Daemon.sigterm(self, signum, frame)
+
 
         def run(self):
@@ -266 +270 @@
                         while self.loop():
                                 pass
+                except SystemExit, e:
+                        pass
                 except:
                         logging.critical(traceback.format_exc())