Django

Code

Show
Ignore:
Timestamp:
06/30/08 10:38:16 (6 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7768 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7808
  • django/branches/newforms-admin/django/utils/daemonize.py

    r7351 r7809  
    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()