@@ -6,7 +6,7 @@ require 'yajl' class CollectdJSON def initialize(opts={}) - @rrddir = opts[:rrddir] || "/var/lib/collectd/rrd" + @rrddir = opts[:rrddir] || CollectdJSON.rrddir @fallback_colors = opts[:fallback_colors] || {} @used_fallbacks = [] end @@ -94,7 +94,11 @@ class CollectdJSON end class << self - attr_accessor :rrddir + attr_writer :rrddir + + def rrddir + @rrddir || @rrddir = "/var/lib/collectd/rrd" + end def hosts if @rrddir lib/collectd-json.rb @@ -63,8 +63,7 @@ get %r{/data/([^/]+)/([^/]+)((/[^/]+)*)} do plugin = params[:captures][1] plugin_instances = params[:captures][2] - collectd = CollectdJSON.new(:rrddir => Visage::Config.rrddir, - :fallback_colors => Visage::Config.fallback_colors) + collectd = CollectdJSON.new(:fallback_colors => Visage::Config.fallback_colors) json = collectd.json(:host => host, :plugin => plugin, :plugin_instances => plugin_instances, visage.rb 8cbc4ba4a805a707f9060789bdf117d64c2fbc3d jf jfs.world@gmail.com http://github.com/jf/visage/commit/06de70eb31a81aa8e262767d4144b6a1852e074f 06de70eb31a81aa8e262767d4144b6a1852e074f 2009-10-12T01:07:44-07:00 2009-10-12T01:07:44-07:00 refactor - better cognitive scalability regarding the setting of 'rrddir' 6c3c3100c75cc40d52be6d8946e1149239368f75 jf jfs.world@gmail.com