Callbacks rework

daemonize.py

@@ -27,11 +27,12 @@ class Daemonize(object):
     :param action: your custom function which will be executed after daemonization.
     :param keep_fds: optional list of fds which should not be closed.
     :param auto_close_fds: optional parameter to not close opened fds.
-    :param privileged_action: action that will be executed before drop privileges if user or
+    :param privileged_action: optional action that will be executed before drop privileges if user or
                               group parameter is provided.
                               If you want to transfer anything from privileged_action to action, such as
                               opened privileged file descriptor, you should return it from
                               privileged_action function and catch it inside action function.
+    :param sigterm_action: optional action which will be executed once sigterm signal is received by the deamon.
     :param user: drop privileges to this user if provided.
     :param group: drop privileges to this group if provided.
     :param verbose: send debug messages to logger if provided.
@@ -41,18 +42,19 @@ class Daemonize(object):
     """
     def __init__(self, app, pid, action,
                  keep_fds=None, auto_close_fds=True, privileged_action=None,
-                 user=None, group=None, verbose=False, logger=None,
+                 sigterm_action=None, user=None, group=None, verbose=False, logger=None,
                  foreground=False, chdir="/"):
         self.app = app
         self.pid = os.path.abspath(pid)
         self.action = action
         self.keep_fds = keep_fds or []
+        self.auto_close_fds = auto_close_fds
         self.privileged_action = privileged_action or (lambda: ())
+        self.sigterm_action = sigterm_action
         self.user = user
         self.group = group
         self.logger = logger
         self.verbose = verbose
-        self.auto_close_fds = auto_close_fds
         self.foreground = foreground
         self.chdir = chdir
 
@@ -61,6 +63,9 @@ def sigterm(self, signum, frame):
         These actions will be done after SIGTERM.
         """
         self.logger.warn("Caught signal %s. Stopping daemon." % signum)
+        if self.sigterm_action:
+            self.logger.debug("Executing daemon's sigterm_action() now")
+            self.sigterm_action()
         sys.exit(0)
 
     def exit(self):
@@ -243,6 +248,7 @@ def start(self):
 
         try:
             self.action(*privileged_action_result)
+
         except Exception:
             for line in traceback.format_exc().split("\n"):
                 self.logger.error(line)

tests/daemon_sigterm.py

@@ -12,5 +12,8 @@ def main():
     while True:
         sleep(5)
 
-daemon = Daemonize(app="test_app", pid=pid, action=main)
+def end():
+    pass
+
+daemon = Daemonize(app="test_app", pid=pid, action=main, sigterm_action=end)
 daemon.start()