lib/start.rb in riemann-babbler-0.9.9.1 vs lib/start.rb in riemann-babbler-0.9.9.2

@@ -7,11 +7,10 @@
 
 class Riemann::Babbler::Starter
 
   attr_reader :logger
   attr_reader :opts
-  attr_reader :riemann
   attr_reader :config
 
   def initialize(opts, configatron)
     @opts = opts
     @config = configatron
@@ -25,10 +24,11 @@
 
   def start!
     merge_config
     set_logger_lvl
     load_plugins
+    $riemann = get_riemann
     start_plugins!
   end
 
   def merge_config
     config_file =  if File.exist?( opts[:config] )
@@ -110,25 +110,21 @@
     cmd = "class Riemann::Babbler::#{new_class} < Riemann::Babbler::#{parent_class}; end;"
     cmd += "Riemann::Babbler.registered_plugins << Riemann::Babbler::#{new_class}"
     eval(cmd)
   end
 
-  def riemann
-    @riemann ||= get_riemann
-  end
-
   def get_riemann
     begin
       riemann_ip =  Resolv.new.getaddress(config.riemann.host)
       riemann = Riemann::Client.new(
         :host => riemann_ip,
         :port => config.riemann.port
       )
       riemann = ( config.riemann.proto == 'tcp' ) ? riemann.tcp : riemann
       riemann.connect
     rescue
-      logger.fatal "Can't resolv riemann host: #{config.riemann.host}"
+      logger.fatal "Can't resolv or connect to riemann host: #{config.riemann.host}"
       sleep 5
       retry
     end
     riemann
   end
@@ -142,10 +138,10 @@
   end
 
   def start_plugins!
     plugin_threads = started_plugins.map do |plugin|
       Thread.new {
-        plugin.new( config, logger, riemann ).run
+        plugin.new( config, logger, $riemann ).run
       }
     end
 
     # plugin control
     Signal.trap 'TERM' do