From 61991fe3db35ddf18a2588986baa642f65fa75a9 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Wed, 28 Sep 2011 23:11:18 +0100
Subject: [PATCH] do not install extra temporary signal handlers
---
client/djrandom_client/daemonize.py | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/client/djrandom_client/daemonize.py b/client/djrandom_client/daemonize.py
index ae51764..b70aa32 100644
--- a/client/djrandom_client/daemonize.py
+++ b/client/djrandom_client/daemonize.py
@@ -7,7 +7,6 @@ import platform
import pwd
import sys
import syslog
-import signal
log = logging.getLogger(__name__)
@@ -108,22 +107,6 @@ def daemonize(opts, main_function, args, support_gevent=False):
os.chown(opts.pidfile, user_pw.pw_uid, user_pw.pw_gid)
os.setuid(user_pw.pw_uid)
- if support_gevent:
- import gevent
- def _sighandler(signum):
- log.info('terminated by signal %d' % signum)
- pidfile.release()
- sys.exit(0)
- gevent.signal(signal.SIGTERM, _sighandler, 15)
- gevent.signal(signal.SIGINT, _sighandler, 3)
- else:
- def _sighandler(signum, frame):
- log.info('terminated by signal %d' % signum)
- pidfile.release()
- sys.exit(0)
- signal.signal(signal.SIGTERM, _sighandler)
- signal.signal(signal.SIGINT, _sighandler)
-
if not opts.foreground:
null_fd = open(os.devnull, 'r+')
for stream in (sys.stdin, sys.stdout, sys.stderr):
--
GitLab