diff options
| author | Rob Austein <sra@hactrn.net> | 2014-08-28 16:14:45 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-08-28 16:14:45 +0000 |
| commit | 73c8c21f02aadaf702ef41849e8954c12e65ed8d (patch) | |
| tree | 48e7da7b86263f3223c6b5aaf0a5a744356ef0db | |
| parent | c196027c94d28b45c386b1a8f0052225475bc2e9 (diff) | |
Log connection info in simplified HTTP server.
svn path=/branches/tk705/; revision=5937
| -rw-r--r-- | rpki/http_simple.py | 3 | ||||
| -rw-r--r-- | rpki/log.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/rpki/http_simple.py b/rpki/http_simple.py index d50fd993..16a1d792 100644 --- a/rpki/http_simple.py +++ b/rpki/http_simple.py @@ -60,8 +60,7 @@ class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.wfile.write(der) def log_message(self, *args): - # Might want to use LogAdapter for connection info here? - logger.info(*args) + logger.info(*args, extra = dict(context = "%s:%s" % self.client_address)) def server(handlers, port, host = ""): diff --git a/rpki/log.py b/rpki/log.py index 2abb3b2c..4fe2a808 100644 --- a/rpki/log.py +++ b/rpki/log.py @@ -96,7 +96,10 @@ class Formatter(object): yield time.strftime("%Y-%m-%d %H:%M:%S ", time.gmtime(record.created)) yield "%s[%d]: " % (self.ident, record.process) try: - yield repr(record.context) + " " + if isinstance(record.context, (str, unicode)): + yield record.context + " " + else: + yield repr(record.context) + " " except AttributeError: pass yield record.getMessage() |