From c4c8b4ed5363c2e82f105d5332bbf767889e96f3 Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Sun, 18 Nov 2012 20:50:05 -0800 Subject: [PATCH] use logging mechanism instead of print --- server-ca/makechallenge-daemon.py | 9 ++++----- server-ca/payment-daemon.py | 2 +- server-ca/testchallenge-daemon.py | 17 ++++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/server-ca/makechallenge-daemon.py b/server-ca/makechallenge-daemon.py index 86499fe83..bb4c7918a 100755 --- a/server-ca/makechallenge-daemon.py +++ b/server-ca/makechallenge-daemon.py @@ -25,7 +25,7 @@ def makechallenge(session): # pending-requests queue and not pushed into any other queue. # We don't have to remove it from pending-makechallenge # because the caller has already done so. - if debug: print "removing expired session", short(session) + log("removing expired session", session) r.lrem("pending-requests", session) return # Currently only makes challenges of type 0 (DomainValidateSNI) @@ -37,9 +37,8 @@ def makechallenge(session): # Make one challenge for each name. (This one-to-one relationship # is not an inherent protocol requirement!) names = r.lrange("%s:names" % session, 0, -1) - if debug: print "%s: new valid request" % session - if debug: print "%s: from requesting client at %s" % (short(session), r.hget(session, "client-addr")) - if debug: print "%s: for %d names: %s" % (short(session), len(names), ", ".join(names)) + log("new valid request from requesting client at %s" % r.hget(session, "client-addr"), session) + log("for %d names: %s" % (len(names), ", ".join(names), session) for i, name in enumerate(names): challenge = "%s:%d" % (session, i) r.hset(challenge, "challtime", int(time.time())) @@ -52,7 +51,7 @@ def makechallenge(session): r.hset(challenge, "dvsni:ext", "1.3.3.7") # Keep accurate count of how many challenges exist in this session. r.hincrby(session, "challenges", 1) - if debug: print "created new challenge", short(challenge) + log("created new challenge %s" % challenge, session) if True: # challenges have been created r.hset(session, "state", "testchallenge") else: diff --git a/server-ca/payment-daemon.py b/server-ca/payment-daemon.py index 28b8416de..4fc6e1976 100755 --- a/server-ca/payment-daemon.py +++ b/server-ca/payment-daemon.py @@ -47,7 +47,7 @@ for message in ps.listen(): if len(session) != 64: continue if session not in r or r.hget(session, "live") != "True": continue if r.hget(session, "state") != "payment": continue - if debug: print "\t** All challenges satisfied; payment received; request %s GRANTED" % short(session) + log("\t** All challenges satisfied; payment received; request GRANTED", session) r.hset(session, "state", "issue") r.lpush("pending-issue", session) continue diff --git a/server-ca/testchallenge-daemon.py b/server-ca/testchallenge-daemon.py index 505dbd657..31551f79f 100755 --- a/server-ca/testchallenge-daemon.py +++ b/server-ca/testchallenge-daemon.py @@ -34,7 +34,7 @@ def testchallenge(session): # pending-requests queue and not pushed into any other queue. # We don't have to remove it from pending-testchallenge # because the caller has already done so. - if debug: print "removing expired session", short(session) + log("removing expired session", session) r.lrem("pending-requests", session) return if r.hget(session, "state") != "testchallenge": @@ -49,7 +49,7 @@ def testchallenge(session): all_satisfied = True for i, name in enumerate(r.lrange("%s:names" % session, 0, -1)): challenge = "%s:%d" % (session, i) - if debug: print "testing challenge", short(challenge) + log("testing challenge %s" % challenge, session) challtime = int(r.hget(challenge, "challtime")) challtype = int(r.hget(challenge, "type")) name = r.hget(challenge, "name") @@ -59,15 +59,14 @@ def testchallenge(session): if not satisfied and not failed: # if debug: print "challenge", short(challenge), "being tested" if challtype == 0: # DomainValidateSNI - if debug: print "\tbeginning dvsni test to %s" % name + log("\tbeginning dvsni test to %s" % name, session) dvsni_nonce = r.hget(challenge, "dvsni:nonce") dvsni_r = r.hget(challenge, "dvsni:r") dvsni_ext = r.hget(challenge, "dvsni:ext") direct_result, direct_reason = verify_challenge(name, dvsni_r, dvsni_nonce, False) proxy_result, proxy_reason = verify_challenge(name, dvsni_r, dvsni_nonce, True) - if debug: - print "\t...direct probe: %s (%s)" % (direct_result, direct_reason) - print "\tTor proxy probe: %s (%s)" % (proxy_result, proxy_reason) + log("\t...direct probe: %s (%s)" % (direct_result, direct_reason), session) + log("\tTor proxy probe: %s (%s)" % (proxy_result, proxy_reason), session) if direct_result and proxy_result: r.hset(challenge, "satisfied", True) else: @@ -80,7 +79,7 @@ def testchallenge(session): # Don't know how to handle this challenge type all_satisfied = False elif not satisfied: - if debug: print "\tchallenge was not attempted" + log("\tchallenge was not attempted", session) all_satisfied = False if all_satisfied: # Challenges all succeeded, so we should prepare to issue @@ -91,7 +90,7 @@ def testchallenge(session): # the daemon that put this session on the queue should # also have implicitly guaranteed this). if policy.payment_required(session): - if debug: print "\t** All challenges satisfied; request %s NEEDS PAYMENT" % short(session) + log("\t** All challenges satisfied; request NEEDS PAYMENT", session) # Try to get a unique abbreviated ID (10 hex digits) for i in xrange(20): abbreviation = random()[:10] @@ -110,7 +109,7 @@ def testchallenge(session): # instantaneously as soon as the payment system sends a "payments" # pubsub message to the payments daemon. else: - if debug: print "\t** All challenges satisfied; request %s GRANTED" % short(session) + log("\t** All challenges satisfied; request GRANTED", session) r.hset(session, "state", "issue") r.lpush("pending-issue", session) else: