Django

Code

Show
Ignore:
Timestamp:
07/04/08 15:16:22 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified GeoWhereNode accordingly for changes in r7835.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7767 to /django/trunk:1-7835
  • django/branches/gis/django/utils/daemonize.py

    r7354 r7836  
    33 
    44if os.name == 'posix': 
    5     def become_daemon(our_home_dir='.', out_log='/dev/null', err_log='/dev/null'): 
     5    def become_daemon(our_home_dir='.', out_log='/dev/null', 
     6                      err_log='/dev/null', umask=022): 
    67        "Robustly turn into a UNIX daemon, running in our_home_dir." 
    78        # First fork 
     
    1415        os.setsid() 
    1516        os.chdir(our_home_dir) 
    16         os.umask(0
     17        os.umask(umask
    1718 
    1819        # Second fork 
     
    3334        sys.stdout, sys.stderr = so, se 
    3435else: 
    35     def become_daemon(our_home_dir='.', out_log=None, err_log=None): 
     36    def become_daemon(our_home_dir='.', out_log=None, err_log=None, umask=022): 
    3637        """ 
    3738        If we're not running under a POSIX system, just simulate the daemon 
     
    3940        """ 
    4041        os.chdir(our_home_dir) 
    41         os.umask(0
     42        os.umask(umask
    4243        sys.stdin.close() 
    4344        sys.stdout.close()