diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2008-06-12 01:06:39 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2008-06-12 01:06:39 +0000 |
| commit | 93baa718c3182f3b2b59280ac141e71a4a75b29c (patch) | |
| tree | f228f295a9c38cc9bdbf6e71cdf2b58a37c95a08 /src | |
| parent | ffd4e7cbfb11ab7cc4086d2bf84fc15d1820139a (diff) | |
| download | bcfg2-93baa718c3182f3b2b59280ac141e71a4a75b29c.tar.gz bcfg2-93baa718c3182f3b2b59280ac141e71a4a75b29c.tar.bz2 bcfg2-93baa718c3182f3b2b59280ac141e71a4a75b29c.zip | |
Improve error messages in client metadata resolution failure path (Resolves Ticket #563)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4693 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -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: |