aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/server.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-03-11 02:16:22 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-03-11 02:16:22 +0100
commit15c82f743f6969b11afe17ecb82840e70d6b3ba3 (patch)
tree6eb6041f2db1be8a4f07d97e777bd877d6194049 /libmproxy/proxy/server.py
parentc1fff51b1bf25ac048149398ae6b6dc14882a838 (diff)
downloadmitmproxy-15c82f743f6969b11afe17ecb82840e70d6b3ba3.tar.gz
mitmproxy-15c82f743f6969b11afe17ecb82840e70d6b3ba3.tar.bz2
mitmproxy-15c82f743f6969b11afe17ecb82840e70d6b3ba3.zip
fix temporary server change, coverage++
Diffstat (limited to 'libmproxy/proxy/server.py')
-rw-r--r--libmproxy/proxy/server.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index a5b95fb7..dc502e1c 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -90,13 +90,15 @@ class ConnectionHandler:
continue
# FIXME: Do we want to persist errors?
- except (ProxyError, tcp.NetLibError), e:
+ except (ProxyError, tcp.NetLibError, IOError), e:
handle_error(self.conntype, self, e)
except Exception, e:
- self.log(e.__class__)
- import traceback
+ import traceback, sys
self.log(traceback.format_exc())
- self.log(str(e))
+ print >> sys.stderr, traceback.format_exc()
+ print >> sys.stderr, "mitmproxy has crashed!"
+ print >> sys.stderr, "Please lodge a bug report at: https://github.com/mitmproxy/mitmproxy"
+ raise e
self.del_server_connection()
self.log("clientdisconnect")