1
0
mirror of https://github.com/certbot/certbot.git synced 2026-01-26 07:41:33 +03:00

Merge branch 'master' of github.com:research/chocolate

This commit is contained in:
James Kasten
2012-11-18 23:37:13 -05:00
5 changed files with 5 additions and 5 deletions

View File

@@ -20,7 +20,7 @@ issue_lock = redis_lock.redis_lock(r, "issue_lock")
debug = "debug" in sys.argv
clean_shutdown = False
from daemon_common import signal_handler, short, random, random_raw
from daemon_common import signal_handler, short, random, random_raw, log
signal.signal(signal.SIGTERM, signal_handler)
signal.signal(signal.SIGINT, signal_handler)

View File

@@ -10,7 +10,7 @@ ps = r.pubsub()
debug = "debug" in sys.argv
clean_shutdown = False
from daemon_common import signal_handler
from daemon_common import signal_handler, log
signal.signal(signal.SIGTERM, signal_handler)
signal.signal(signal.SIGINT, signal_handler)

View File

@@ -11,7 +11,7 @@ ps = r.pubsub()
debug = "debug" in sys.argv
clean_shutdown = False
from daemon_common import signal_handler, short, random, random_raw
from daemon_common import signal_handler, short, random, random_raw, log
signal.signal(signal.SIGTERM, signal_handler)
signal.signal(signal.SIGINT, signal_handler)

View File

@@ -32,7 +32,7 @@ ps = r.pubsub()
debug = "debug" in sys.argv
clean_shutdown = False
from daemon_common import signal_handler, short
from daemon_common import signal_handler, short, log
signal.signal(signal.SIGTERM, signal_handler)
signal.signal(signal.SIGINT, signal_handler)

View File

@@ -15,7 +15,7 @@ ps = r.pubsub()
debug = "debug" in sys.argv
clean_shutdown = False
from daemon_common import signal_handler, short, random, random_raw
from daemon_common import signal_handler, short, random, random_raw, log
def signal_handler(a, b):
global clean_shutdown