riemann-babbler 0.5.5 → 0.5.6

data/bin/riemann-babbler

@@ -79,10 +79,6 @@ unless configatron.plugins.files.nil?
   end
 end
 
-# патч на dns resolv
-ipaddress = Resolv.new.getaddresses(configatron.riemann.host)
-configatron.riemann.host = ipaddress[rand(ipaddress.length)]
-
 # start plugins
 plugins.each { |plugin| require plugin }
 
@@ -92,7 +88,7 @@ plugin_threads = Riemann::Babbler.registered_plugins.map do |plugin|
   }
 end
 
-Signal.trap "USR2" do # перехватываем сообщение (на будущее)
+Signal.trap "TERM" do # перехватываем сообщение (на будущее)
   plugin_threads.each( &:kill )
 end
 

data/config.yml

@@ -1,6 +1,7 @@
 riemann:
   host: localhost
   port: 5555
+  dns_ttl: 120
 
 logger:
   level: WARN

data/lib/riemann/babbler/plugin.rb

@@ -26,6 +26,9 @@ module Riemann
       @configatron = configatron
       @logger = logger
       @storage = Hash.new
+      @configatron.riemann.cache_host = Configatron::Dynamic.new{ riemann_ip }
+      @configatron.riemann.last_cache_time = Time.now
+      @riemann_ip = riemann_random_ip
       init
       run
     end
@@ -41,9 +44,22 @@ module Riemann
     end
     alias :opts :options
 
+    def riemann_ip
+      if Time.now - options.riemann.last_cache_time > options.riemann.dns_ttl
+        options.riemann.last_cache_time = Time.now  
+        @riemann_ip = riemann_random_ip
+      end
+      @riemann_ip
+    end
+
+    def riemann_random_ip
+      ipaddress = Resolv.new.getaddresses(configatron.riemann.host)
+      ipaddress[rand(ipaddress.length)]
+    end
+
     def riemann
       @riemann ||= Riemann::Client.new(
-        :host => options.riemann.host,
+        :host => options.riemann.cache_host,
         :port => options.riemann.port
       )
     end

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.5.5'
+    VERSION = '0.5.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3108950723921484230
+      hash: -4231455956657341224
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: