summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Proxy.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Proxy.py')
-rw-r--r--src/lib/Bcfg2/Proxy.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Proxy.py b/src/lib/Bcfg2/Proxy.py
index 72953ef3e..3b406c78e 100644
--- a/src/lib/Bcfg2/Proxy.py
+++ b/src/lib/Bcfg2/Proxy.py
@@ -91,7 +91,8 @@ class RetryMethod(xmlrpclib._Method):
msg = "Server failure: %s" % err
except CertificateError:
err = sys.exc_info()[1]
- msg = "Got unallowed commonName %s from server" % err.commonName
+ msg = "Got unallowed commonName %s from server" % \
+ err.commonName
except KeyError:
err = sys.exc_info()[1]
msg = "Server disallowed connection: %s" % err
@@ -99,8 +100,9 @@ class RetryMethod(xmlrpclib._Method):
err = sys.exc_info()[1]
msg = err
except:
- err = sys.exc_info()[1]
- msg = "Unknown failure: %s" % err
+ raise
+ etype, err = sys.exc_info()[:2]
+ msg = "Unknown failure: %s (%s)" % (err, etype.__name__)
if msg:
if final:
self.log.error(msg)