riemann-babbler 2.8.1 → 2.8.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/riemann/babbler/plugin.rb +4 -5
- data/lib/riemann/babbler/plugin_manager.rb +5 -1
- data/lib/riemann/babbler/sender_client.rb +1 -1
- data/lib/riemann/babbler/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2db7f224c53340296399c759d9f5b71bf0ce5e5b
|
|
4
|
+
data.tar.gz: ee51fcb80b82629a83ee3d992722145f42b3ff00
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e224bbc2eecdc2df22319c9b7f56cccec5ea6094492cbe62ab1eda7d8011cd322b45093dda3dabfa70b2ea5a1dbf41aa3a1ffb7a5cd050fb7235379b662e1200
|
|
7
|
+
data.tar.gz: d37572598ac88b4b78d90d1666bd2b714384c6859db64ab61849c0d72e5b15c8ae3023ac9f99269a79cd6aaea256d4b9f5e9a3b95194f209a14589111379a5a2
|
data/Gemfile.lock
CHANGED
|
@@ -152,11 +152,11 @@ module Riemann
|
|
|
152
152
|
# Main method
|
|
153
153
|
def run!
|
|
154
154
|
return 0 unless run_plugin
|
|
155
|
-
|
|
155
|
+
sleep Random.new.rand(10)
|
|
156
156
|
loop do
|
|
157
|
-
|
|
157
|
+
t_start = Time.now
|
|
158
158
|
begin
|
|
159
|
-
Timeout::timeout(plugin.interval) { tick }
|
|
159
|
+
Timeout::timeout(plugin.interval.to_f * 2/3 ) { tick }
|
|
160
160
|
rescue TimeoutError
|
|
161
161
|
plugin_error!('Timeout plugin execution')
|
|
162
162
|
rescue => e
|
|
@@ -164,8 +164,7 @@ module Riemann
|
|
|
164
164
|
else
|
|
165
165
|
plugin_no_error!
|
|
166
166
|
end
|
|
167
|
-
|
|
168
|
-
sleep(plugin.interval - ((Time.now - t0) % plugin.interval))
|
|
167
|
+
sleep(plugin.interval - (Time.now - t_start).to_i)
|
|
169
168
|
end
|
|
170
169
|
|
|
171
170
|
end
|
|
@@ -43,7 +43,11 @@ module Riemann
|
|
|
43
43
|
log :debug, "Check alive of threads [#{@mapping.count}]"
|
|
44
44
|
@mapping.each do |plugin, thread|
|
|
45
45
|
next if thread.alive?
|
|
46
|
-
|
|
46
|
+
begin
|
|
47
|
+
thread.join
|
|
48
|
+
rescue => e
|
|
49
|
+
log :error, "has error #{e.class}: #{e}\n #{e.backtrace.join("\n")}"
|
|
50
|
+
end
|
|
47
51
|
@mapping[plugin] = run_thread(plugin)
|
|
48
52
|
end
|
|
49
53
|
end
|