riemann-babbler 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d309eed8bd60ad4eda63dcb183df8239d69d085
-  data.tar.gz: 78faedc3c512c7cb9efb4b5f2ce2316c24c33549
+  metadata.gz: 2db7f224c53340296399c759d9f5b71bf0ce5e5b
+  data.tar.gz: ee51fcb80b82629a83ee3d992722145f42b3ff00
 SHA512:
-  metadata.gz: c631ca2230fe694cb26c285cc54a32834268a451504ffc1af2df2e2f711d73ae023fd62658f3b5fe22a5c3ddee2ed44272c871dc6076c39b1c4953e238623849
-  data.tar.gz: e504c619e9eb73a044054214513cfb3c618c4e7dc56cbc0237239224b4de61a57df133af4d44f0b0628da51d5105e63be19c480c64b13fe61b65e2507a5b807c
+  metadata.gz: e224bbc2eecdc2df22319c9b7f56cccec5ea6094492cbe62ab1eda7d8011cd322b45093dda3dabfa70b2ea5a1dbf41aa3a1ffb7a5cd050fb7235379b662e1200
+  data.tar.gz: d37572598ac88b4b78d90d1666bd2b714384c6859db64ab61849c0d72e5b15c8ae3023ac9f99269a79cd6aaea256d4b9f5e9a3b95194f209a14589111379a5a2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riemann-babbler (2.8.1)
+    riemann-babbler (2.8.2)
       beefcake
       configatron
       docile

data/lib/riemann/babbler/plugin.rb

@@ -152,11 +152,11 @@ module Riemann
       # Main method
       def run!
         return 0 unless run_plugin
-        t0 = Time.now
+        sleep Random.new.rand(10)
         loop do
-
+          t_start = Time.now
           begin
-            Timeout::timeout(plugin.interval) { tick }
+            Timeout::timeout(plugin.interval.to_f * 2/3 ) { tick }
           rescue TimeoutError
             plugin_error!('Timeout plugin execution')
           rescue => e
@@ -164,8 +164,7 @@ module Riemann
           else
             plugin_no_error!
           end
-
-          sleep(plugin.interval - ((Time.now - t0) % plugin.interval))
+          sleep(plugin.interval - (Time.now - t_start).to_i)
         end
 
       end

data/lib/riemann/babbler/plugin_manager.rb

@@ -43,7 +43,11 @@ module Riemann
         log :debug, "Check alive of threads [#{@mapping.count}]"
         @mapping.each do |plugin, thread|
           next if thread.alive?
-          log :error, "Plugin: #{plugin} is #{thread.inspect}, run it..."
+          begin
+            thread.join
+          rescue => e
+            log :error, "has error #{e.class}: #{e}\n #{e.backtrace.join("\n")}"
+          end
           @mapping[plugin] = run_thread(plugin)
         end
       end

data/lib/riemann/babbler/sender_client.rb

@@ -11,7 +11,7 @@ module Riemann
         include Riemann::Babbler::Options
         include Riemann::Babbler::Errors
 
-        INTERVAL_FLUSH = 0.1
+        INTERVAL_FLUSH = 1
 
         attr_accessor :host, :port, :events
 

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.8.1'
+    VERSION = '2.8.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Vasiliev Dmitry