aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/base.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-11 01:39:33 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-11 01:39:33 +0200
commitffdf143be42490f05cb2b69cdb83e74264d6070a (patch)
treec862055d2a73aeb3689ffbb9770b980d9b4cbff5 /libmproxy/protocol/base.py
parentc159c8ca13afa6a909f456e41c1a3f57b98baf8a (diff)
downloadmitmproxy-ffdf143be42490f05cb2b69cdb83e74264d6070a.tar.gz
mitmproxy-ffdf143be42490f05cb2b69cdb83e74264d6070a.tar.bz2
mitmproxy-ffdf143be42490f05cb2b69cdb83e74264d6070a.zip
better exception handling
Diffstat (limited to 'libmproxy/protocol/base.py')
-rw-r--r--libmproxy/protocol/base.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py
index 9d8c8bfe..6793d3df 100644
--- a/libmproxy/protocol/base.py
+++ b/libmproxy/protocol/base.py
@@ -1,4 +1,6 @@
from __future__ import (absolute_import, print_function, division)
+import six
+import sys
from netlib import tcp
from ..models import ServerConnection
from ..exceptions import ProtocolException
@@ -172,8 +174,12 @@ class ServerConnectionMixin(object):
try:
self.server_conn.connect()
except tcp.NetLibError as e:
- raise ProtocolException(
- "Server connection to %s failed: %s" % (repr(self.server_conn.address), e), e)
+ six.reraise(
+ ProtocolException,
+ ProtocolException("Server connection to %s failed: %s" %
+ (repr(self.server_conn.address), e), e),
+ sys.exc_info()[2]
+ )
class Kill(Exception):