diff --git a/server-ca/daemon_common.py b/server-ca/daemon_common.py index 80a0cb146..d612f4c0a 100644 --- a/server-ca/daemon_common.py +++ b/server-ca/daemon_common.py @@ -5,6 +5,9 @@ import time, binascii from Crypto import Random +import redis +log_redis = redis.Redis() + def signal_handler(a, b): global clean_shutdown clean_shutdown = True @@ -27,6 +30,6 @@ def random_raw(): def log(msg, session = None): if session: - r.publish("logs", "%s: %s" % (short(session), msg)) + log_redis.publish("logs", "%s: %s" % (short(session), msg)) else: - r.publish("logs", "%s" % session) + log_redis.publish("logs", "%s" % session) diff --git a/server-ca/issue-daemon.py b/server-ca/issue-daemon.py index 7e0053fec..298119e46 100755 --- a/server-ca/issue-daemon.py +++ b/server-ca/issue-daemon.py @@ -7,7 +7,6 @@ import redis, redis_lock, CSR, sys, signal from sni_challenge.verify import verify_challenge from Crypto import Random -global r r = redis.Redis() ps = r.pubsub() issue_lock = redis_lock.redis_lock(r, "issue_lock") diff --git a/server-ca/logging-daemon.py b/server-ca/logging-daemon.py index 209c22d18..7bbf8f327 100755 --- a/server-ca/logging-daemon.py +++ b/server-ca/logging-daemon.py @@ -4,7 +4,6 @@ import redis, signal, sys -global r r = redis.Redis() ps = r.pubsub() diff --git a/server-ca/makechallenge-daemon.py b/server-ca/makechallenge-daemon.py index e19f5b068..86499fe83 100755 --- a/server-ca/makechallenge-daemon.py +++ b/server-ca/makechallenge-daemon.py @@ -5,7 +5,6 @@ import redis, time, sys, signal -global r r = redis.Redis() ps = r.pubsub() diff --git a/server-ca/payment-daemon.py b/server-ca/payment-daemon.py index b8e28023c..28b8416de 100755 --- a/server-ca/payment-daemon.py +++ b/server-ca/payment-daemon.py @@ -26,7 +26,6 @@ import redis, signal, sys -global r r = redis.Redis() ps = r.pubsub() diff --git a/server-ca/testchallenge-daemon.py b/server-ca/testchallenge-daemon.py index 9f062577f..505dbd657 100755 --- a/server-ca/testchallenge-daemon.py +++ b/server-ca/testchallenge-daemon.py @@ -9,7 +9,6 @@ import policy from redis_lock import redis_lock from sni_challenge.verify import verify_challenge -global r r = redis.Redis() ps = r.pubsub()