From ca5918e8ff3da9b30243fa3b5cc273766ccf3008 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 30 Jun 2008 11:22:41 +0000 Subject: Fixed #6994 -- For fastcgi, set a more sensible default umask. Also allow the umask value to be customised. Thanks, Antonis Christofides. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7800 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/daemonize.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'django/utils') diff --git a/django/utils/daemonize.py b/django/utils/daemonize.py index f0c2f684bd..68e5392d89 100644 --- a/django/utils/daemonize.py +++ b/django/utils/daemonize.py @@ -2,7 +2,8 @@ import os 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=022): "Robustly turn into a UNIX daemon, running in our_home_dir." # First fork try: @@ -13,7 +14,7 @@ if os.name == 'posix': sys.exit(1) os.setsid() os.chdir(our_home_dir) - os.umask(0) + os.umask(umask) # Second fork try: @@ -32,13 +33,13 @@ if os.name == 'posix': # 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=022): """ 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() -- cgit v1.3