diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-05-11 09:40:54 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-05-11 09:40:54 -0500 |
| commit | ab630238a5a8634777c49c121e5e299c06abf481 (patch) | |
| tree | 2061a7df2c6ceaaef5e1a436ba7073cca42f5439 | |
| parent | b933e161dcce5a178fc869d65044d0cf56df29fd (diff) | |
| parent | 283d7406394ef8282c5ab11a71fe0c28e4c8421f (diff) | |
| download | bcfg2-ab630238a5a8634777c49c121e5e299c06abf481.tar.gz bcfg2-ab630238a5a8634777c49c121e5e299c06abf481.tar.bz2 bcfg2-ab630238a5a8634777c49c121e5e299c06abf481.zip | |
Merge pull request #280 from AlexanderS/fix-sshbase
Some small fixes for SSHbase
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSHbase.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py index e4fb9b565..b06e28651 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py +++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py @@ -210,7 +210,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, try: names[cmeta.hostname].update( self.get_namecache_entry(ip)) - except socket.gaierror: + except socket.herror: continue names[cmeta.hostname] = sorted(names[cmeta.hostname]) @@ -332,7 +332,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, self.ipcache[client] = False msg = "Failed to find IP address for %s: %s" % (client, result.error) - self.logger(msg) + self.logger.error(msg) raise PluginExecutionError(msg) def get_namecache_entry(self, cip): @@ -342,7 +342,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, if self.namecache[cip]: return self.namecache[cip] else: - raise socket.gaierror + raise socket.herror else: # add an entry that has not been cached try: @@ -353,7 +353,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, self.namecache[cip] = [] self.namecache[cip].extend(rvlookup[1]) return self.namecache[cip] - except socket.gaierror: + except socket.herror: self.namecache[cip] = False self.logger.error("Failed to find any names associated with " "IP address %s" % cip) |