daemon: daemonize can be specified an umask to use, and return different exit code according to process

2 files changed, 17 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 13d8e3d..28610c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,19 @@
 ChangeLog for logilab.common
 ============================
 
+--
+   * daemon: we can now specify umask to daemonize function, and it return
+     different exit code according to the process
+
+
 2010-11-15  --  0.53.0
-    * python3.x: first python3.x release
+    * first python3.x compatible release
 
     * __init__: tempattr context manager
    
     * shellutils: progress context manager
 
+
 2010-10-11  --  0.52.1
     * configuration: fix pb with option names as unicode string w/
       python 2.5. Makes OptionError available through the module
@@ -19,7 +25,6 @@ ChangeLog for logilab.common
     * modutils: Consider arch-specific installation for STD_LIB_DIR definition
 
 
-
 2010-09-28  --  0.52.0
     * testlib is now based on unittest2, to prepare its own extinction.
       Warning are printed so you can easily migration step by step.
diff --git a/daemon.py b/daemon.py
index 78847d1..d705a82 100644
--- a/daemon.py
+++ b/daemon.py
@@ -27,7 +27,12 @@ import time
 import warnings
 
 
-def daemonize(pidfile=None, uid=None):
+def daemonize(pidfile=None, uid=None, umask=077):
+    """daemonize a Unix process. Set paranoid umask by default.
+
+    Return 1 in the original process, 2 in the first fork, and None for the
+    second fork (eg daemon process).
+    """
     # See http://www.erlenstar.demon.co.uk/unix/faq_toc.html#TOC16
     # XXX unix specific
     #
@@ -40,11 +45,12 @@ def daemonize(pidfile=None, uid=None):
     # as a non-session group leader, we can never regain a controlling
     # terminal.
     if os.fork():   # launch child again.
-        return 1
+        return 2
     # move to the root to avoit mount pb
     os.chdir('/')
-    # set paranoid umask
-    os.umask(077)
+    # set umask if specified
+    if umask is not None:
+        os.umask(umask)
     # redirect standard descriptors
     null = os.open('/dev/null', os.O_RDWR)
     for i in range(3):