jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

convert umask in one place

Browse Source
This commit is contained in:
benoitc 2010-02-21 16:43:19 +01:00
parent c47bd5ef2c
commit 71a9a1efeb
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gunicorn/config.py
View File

@ -102,6 +102,16 @@ class Config(object):
raise RuntimeError("Listener address is not set") raise RuntimeError("Listener address is not set")
return util.parse_address(util.to_bytestring(self.conf['bind'])) return util.parse_address(util.to_bytestring(self.conf['bind']))
@property
def umask(self):
if not self.conf['umask']:
return 0
umask = self.conf['umask']
if isinstance(umask, basestring):
return int(umask, 0)
return umask
def _hook(self, hookname, *args): def _hook(self, hookname, *args):
hook = self.conf.get(hookname) hook = self.conf.get(hookname)
if not hook: return if not hook: return

6
gunicorn/main.py
View File

@ -80,7 +80,7 @@ def daemonize(umask):
if os.fork() == 0: if os.fork() == 0:
os.setsid() os.setsid()
if os.fork() == 0: if os.fork() == 0:
os.umask(int(umask, 0)) os.umask(umask)
else: else:
os._exit(0) os._exit(0)
else: else:
@ -135,7 +135,7 @@ def main(usage, get_app):
if conf['daemon']: if conf['daemon']:
daemonize(conf['umask']) daemonize(conf['umask'])
else: else:
os.umask(int(conf['umask'], 0)) os.umask(conf['umask'])
os.setpgrp() os.setpgrp()
set_owner_process(conf['user'], conf['group']) set_owner_process(conf['user'], conf['group'])
configure_logging(conf) configure_logging(conf)
@ -171,7 +171,7 @@ def paste_server(app, global_conf=None, host="127.0.0.1", port=None,
if conf["daemon"] : if conf["daemon"] :
daemonize(conf["umask"]) daemonize(conf["umask"])
else: else:
os.umask(int(conf['umask'], 0)) os.umask(conf['umask'])
os.setpgrp() os.setpgrp()
set_owner_process(conf["user"], conf["group"]) set_owner_process(conf["user"], conf["group"])
configure_logging(conf) configure_logging(conf)

2
gunicorn/management/commands/run_gunicorn.py
View File

@ -69,7 +69,7 @@ class Command(BaseCommand):
if conf['daemon']: if conf['daemon']:
daemonize(conf['umask']) daemonize(conf['umask'])
else: else:
os.umask(int(conf['umask'], 0)) os.umask(conf['umask'])
os.setpgrp() os.setpgrp()
set_owner_process(conf["user"], conf["group"]) set_owner_process(conf["user"], conf["group"])
configure_logging(conf) configure_logging(conf)