summaryrefslogtreecommitdiff
path: root/lib/oxidized/nodes.rb
diff options
context:
space:
mode:
authorJari Salo <jari.salo@tdc.fi>2014-08-25 16:54:35 +0300
committerJari Salo <jari.salo@tdc.fi>2014-08-25 17:17:20 +0300
commitcae7076eeed2b3b5fcfecffde17bcb85d8013af2 (patch)
tree9daef15e75884bce0a6c9b287aacb2ee33364de8 /lib/oxidized/nodes.rb
parent5662795ca35444a3e48eea3c2d8020d63502da84 (diff)
Match IP address explicitly
- New method node_want? - Don't match node to node[:name] if node[:name] is an ip address. Otherwise we might match to wrong ip address.
Diffstat (limited to 'lib/oxidized/nodes.rb')
-rw-r--r--lib/oxidized/nodes.rb20
1 files changed, 14 insertions, 6 deletions
diff --git a/lib/oxidized/nodes.rb b/lib/oxidized/nodes.rb
index 6f30af4..227f656 100644
--- a/lib/oxidized/nodes.rb
+++ b/lib/oxidized/nodes.rb
@@ -9,16 +9,11 @@ module Oxidized
def load node_want=nil
with_lock do
new = []
- node_want_ip = (IPAddr.new(node_want) rescue false) if node_want
@source = CFG.source.default
Oxidized.mgr.add_source @source
Oxidized.mgr.source[@source].new.load.each do |node|
-
# we want to load specific node(s), not all of them
- if node_want
- next unless node_want_ip == node[:ip] or node_want.match(node[:name])
- end
-
+ next unless node_want? node_want, node
begin
_node = Node.new node
new.push _node
@@ -33,6 +28,19 @@ module Oxidized
end
end
+ def node_want? node_want, node
+ node_want_ip = (IPAddr.new(node_want) rescue false)
+ name_is_ip = (IPAddr.new(node[:name]) rescue false)
+ if name_is_ip and node_want_ip == node[:name]
+ true
+ elsif node[:ip] and node_want_ip == node[:ip]
+ true
+ elsif node_want.match node[:name]
+ true unless name_is_ip
+ end
+ end
+
+
def list
with_lock do
map { |e| e.serialize }