diff options
| -rw-r--r-- | src/lib/Proxy.py | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Proxy.py b/src/lib/Proxy.py index cabdebdc5..4c627770a 100644 --- a/src/lib/Proxy.py +++ b/src/lib/Proxy.py @@ -28,6 +28,8 @@ class RetryMethod(_Method): except xmlrpclib.ProtocolError: self.log.error("Server failure: Protocol Error") raise xmlrpclib.Fault(20, "Server Failure") + except xmlrpclib.Fault: + raise except socket.error, err: if retry == 3: self.log.error("Server failure: %s" % err) diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 6cffd2253..a5c5310ba 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -106,7 +106,7 @@ class Bcfg2Serv(Bcfg2.Component.Component): resp.append(probe) return tostring(resp) except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: - warning = 'Client metadata resolution error for %s' % address[0] + warning = 'Client metadata resolution error for %s; check server log' % address[0] self.logger.warning(warning) raise Fault, (6, warning) except: |