diff options
| author | Rob Austein <sra@hactrn.net> | 2011-10-07 21:43:47 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-10-07 21:43:47 +0000 |
| commit | 1157f4bda88f164d038ba2327a8e9531ba4583b5 (patch) | |
| tree | 98494721e2c24f1dc6bd74675d2c78a19d675fa4 /rpkid | |
| parent | 662e34662ba794f6c4b9c39b68dc62f2f4859c25 (diff) | |
Clean up HTTP traceback controls added in [3722], because [4014] does
a better job of handling the traceback problem. See #95.
svn path=/rpkid/rpki/http.py; revision=4026
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/rpki/http.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/rpkid/rpki/http.py b/rpkid/rpki/http.py index 71bb02f2..d8afd44c 100644 --- a/rpkid/rpki/http.py +++ b/rpkid/rpki/http.py @@ -301,7 +301,6 @@ class http_stream(asynchat.async_chat): """ log = log_method - show_tracebacks = False def __repr__(self): status = ["connected"] if self.connected else [] @@ -453,7 +452,7 @@ class http_stream(asynchat.async_chat): etype = sys.exc_info()[0] if etype in (SystemExit, rpki.async.ExitNow): raise - rpki.log.traceback(self.show_tracebacks) + rpki.log.traceback() if etype is not rpki.exceptions.HTTPClientAborted: self.log("Closing due to error", rpki.log.warn) self.close() @@ -534,7 +533,7 @@ class http_server(http_stream): except (rpki.async.ExitNow, SystemExit): raise except Exception, e: - rpki.log.traceback(self.show_tracebacks) + rpki.log.traceback() self.send_error(500, "Unhandled exception %s" % e) else: self.send_error(code = error[0], reason = error[1]) @@ -579,7 +578,6 @@ class http_listener(asyncore.dispatcher): """ log = log_method - show_tracebacks = False def __repr__(self): try: @@ -605,7 +603,7 @@ class http_listener(asyncore.dispatcher): self.listen(5) except Exception, e: self.log("Couldn't set up HTTP listener: %s" % e, rpki.log.warn) - rpki.log.traceback(self.show_tracebacks) + rpki.log.traceback() self.close() for h in handlers: self.log("Handling %s" % h[0]) @@ -632,7 +630,7 @@ class http_listener(asyncore.dispatcher): if sys.exc_info()[0] in (SystemExit, rpki.async.ExitNow): raise self.log("Error in HTTP listener", rpki.log.warn) - rpki.log.traceback(self.show_tracebacks) + rpki.log.traceback() class http_client(http_stream): """ |