From 1cdc2738079edf932aa228cb24328d63274d3ff7 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 4 Oct 2012 14:51:59 -0400 Subject: improve some error messages --- src/lib/Bcfg2/Proxy.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2/Proxy.py') 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) -- cgit v1.2.3-1-g7c22