From 2d6af52d214675549b90069f6292bc05fa4ff078 Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Sun, 18 Nov 2012 22:32:58 -0800 Subject: [PATCH] make logging output shorter --- server-ca/chocolate.py | 8 +++++++- server-ca/makechallenge-daemon.py | 2 +- server-ca/testchallenge-daemon.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server-ca/chocolate.py b/server-ca/chocolate.py index 10cf94d78..45770bc3a 100755 --- a/server-ca/chocolate.py +++ b/server-ca/chocolate.py @@ -51,6 +51,12 @@ def safe(what, s): else: return False +def short(thing): + """Return the first 8 bytes of a session ID, or, for a + challenge ID, the challenge ID with the session ID truncated.""" + tmp = thing.partition(":") + return tmp[0][:8] + ".." + tmp[1] + tmp[2] + sessions = redis.Redis() class session(object): @@ -367,7 +373,7 @@ class session(object): # TODO: Process challenge-related messages from the client. def log(self, msg): - sessions.publish("logs", "%s: %s" % (self.id, msg)) + sessions.publish("logs", "%s: %s" % (short(self.id), msg)) if debug: print "%s: %s" % (self.id, msg) def die(self, r, reason, uri=None): diff --git a/server-ca/makechallenge-daemon.py b/server-ca/makechallenge-daemon.py index a424962a4..e66a0eb33 100755 --- a/server-ca/makechallenge-daemon.py +++ b/server-ca/makechallenge-daemon.py @@ -51,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) - log("created new challenge %s" % challenge, session) + log("created new challenge %s" % short(challenge), session) if True: # challenges have been created r.hset(session, "state", "testchallenge") else: diff --git a/server-ca/testchallenge-daemon.py b/server-ca/testchallenge-daemon.py index 6221384fb..30b6c0c83 100755 --- a/server-ca/testchallenge-daemon.py +++ b/server-ca/testchallenge-daemon.py @@ -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) - log("testing challenge %s" % challenge, session) + log("testing challenge %s" % short(challenge), session) challtime = int(r.hget(challenge, "challtime")) challtype = int(r.hget(challenge, "type")) name = r.hget(challenge, "name")