diff options
| -rw-r--r-- | lib/oxidized/api/rest.rb | 19 | ||||
| -rw-r--r-- | lib/oxidized/nodes.rb | 6 | ||||
| -rw-r--r-- | lib/oxidized/output/file.rb | 4 |
3 files changed, 15 insertions, 14 deletions
diff --git a/lib/oxidized/api/rest.rb b/lib/oxidized/api/rest.rb index 4bf464b..d876917 100644 --- a/lib/oxidized/api/rest.rb +++ b/lib/oxidized/api/rest.rb @@ -41,20 +41,11 @@ module Oxidized # /nodes/show/node - returns data about node when /show\/(.*)/ send res, @nodes.show($1) - when /fetch\/(.*)/ # primitive node fetch implementation for file config - /nodes/fetch/$ip_address - if CFG.output[:default] == "file" and $1 != '' # ugly hack to disable configuration fetch for non ascii configurations and ensure that argument is received - @cfg_root = CFG.output[:file] - File.open("#{@cfg_root[:directory]}/#{$1}", "r") do |pipe| - @res_config = [] - while ( line = pipe.gets ) do - @res_config << line # store configuration into an array to format and send - end - end - send res, @res_config - elsif CFG.output[:default] != "file" and $1 != '' - send res, "oxidized 0.0.14 support fetch for ascii configuration files only." # return error to end user - else # return error if no argument is received - send res, "missing argument - example: /nodes/fetch/192.0.2.1" + when /fetch\/(.*)/ + begin + send res, @nodes.fetch($1) + rescue Oxidized::NotSupported => e + send res, e end end end diff --git a/lib/oxidized/nodes.rb b/lib/oxidized/nodes.rb index e5e87e5..dcebe08 100644 --- a/lib/oxidized/nodes.rb +++ b/lib/oxidized/nodes.rb @@ -1,5 +1,6 @@ module Oxidized require 'oxidized/node' + class Oxidized::NotSupported < StandardError; end class Nodes < Array attr_accessor :source alias :put :unshift @@ -26,6 +27,11 @@ module Oxidized i = find_index node self[i].serialize if i end + def fetch node + i = find_index node + raise Oxidized::NotSupported unless Oxidized.mgr.output.respond_to? :fetch + self[i].output.new.fetch node + end def del node i = find_index node delete_at i if i diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb index 66ad178..8aaae0e 100644 --- a/lib/oxidized/output/file.rb +++ b/lib/oxidized/output/file.rb @@ -25,5 +25,9 @@ class OxFile < Output open(file, 'w') { |fh| fh.write data } end + def fetch node + IO.readlines File.join(@cfg[:directory], node) + end + end end |