summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorytti <saku@ytti.fi>2015-02-26 20:18:09 +0200
committerytti <saku@ytti.fi>2015-02-26 20:18:09 +0200
commit28339dc8796c9510c0507a69eabfdd9e96768226 (patch)
tree9edc98544814be1176911db3a8d5b4e3a690d24d
parentfefe55e69502df7b5b3691facd0deaa53750d61c (diff)
parent87c2ad0f0987b71f2bb01a5907b97750af125ccf (diff)
Merge pull request #83 from fhibler/master
Resolving #80 and #81
-rw-r--r--lib/oxidized/node.rb2
-rw-r--r--lib/oxidized/nodes.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index 2d41600..253de53 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -11,7 +11,7 @@ module Oxidized
def initialize opt
@name = opt[:name]
@ip = IPAddr.new(opt[:ip]).to_s rescue nil
- @ip ||= Resolv.getaddress @name
+ @ip ||= Resolv.new.getaddress @name
@group = opt[:group]
@input = resolve_input opt
@output = resolve_output opt
diff --git a/lib/oxidized/nodes.rb b/lib/oxidized/nodes.rb
index 3586b97..cb2fbc5 100644
--- a/lib/oxidized/nodes.rb
+++ b/lib/oxidized/nodes.rb
@@ -23,8 +23,8 @@ module Oxidized
Log.error "node %s is not resolvable, raised %s with message '%s'" % [node, err.class, err.message]
end
end
- Log.info "Loaded #{size} nodes"
size == 0 ? replace(new) : update_nodes(new)
+ Log.info "Loaded #{size} nodes"
end
end