Ticket #6994: 6994.patch

django/core/servers/fastcgi.py

@@ -40 +40 @@
   workdir=DIRECTORY    change to this directory when daemonizing.
   outlog=FILE          write stdout to this file.
   errlog=FILE          write stderr to this file.
+  umask=UMASK          umask to use when daemonizing (default 027).
 
 Examples:
   Run a "standard" fastcgi process on a file-descriptor
@@ -73 +74 @@
     'maxrequests': 0,
     'outlog': None,
     'errlog': None,
+    'umask': None,
 }
 
 def fastcgi_help(message=None):
@@ -159 +161 @@
         daemon_kwargs['out_log'] = options['outlog']
     if options['errlog']:
         daemon_kwargs['err_log'] = options['errlog']
+    if options['umask']:
+        daemon_kwargs['umask'] = int(options['umask'])
 
     if daemonize:
         from django.utils.daemonize import become_daemon

django/utils/daemonize.py

@@ -2 +2 @@
 import sys
 
 if os.name == 'posix':
-    def become_daemon(our_home_dir='.', out_log='/dev/null', err_log='/dev/null'):
+    def become_daemon(our_home_dir='.', out_log='/dev/null',
+                      err_log='/dev/null', umask=027):
         "Robustly turn into a UNIX daemon, running in our_home_dir."
         # First fork
         try:
@@ -13 +14 @@
             sys.exit(1)
         os.setsid()
         os.chdir(our_home_dir)
-        os.umask(0)
+        os.umask(umask)
 
         # Second fork
         try:
@@ -32 +33 @@
         # Set custom file descriptors so that they get proper buffering.
         sys.stdout, sys.stderr = so, se
 else:
-    def become_daemon(our_home_dir='.', out_log=None, err_log=None):
+    def become_daemon(our_home_dir='.', out_log=None, err_log=None, umask=027):
         """
         If we're not running under a POSIX system, just simulate the daemon
         mode by doing redirections and directory changing.
         """
         os.chdir(our_home_dir)
-        os.umask(0)
+        os.umask(umask)
         sys.stdin.close()
         sys.stdout.close()
         sys.stderr.close()