riemann-babbler 2.0.0pre13 → 2.0.0pre15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riemann-babbler (2.0.0pre13)
+    riemann-babbler (2.0.0pre15)
       configatron
       docile
       file-tail

data/lib/riemann/babbler/errors.rb

@@ -5,6 +5,7 @@ module Riemann
       RESOLV_RIEMANN_SERVER = 1
       INIT_CONNECT          = 2
       CONNECTION_PROBLEM    = 3
+      USER_CALL_SHUTDOWN    = 4
     end
 
   end

data/lib/riemann/babbler/plugin_manager.rb

@@ -3,51 +3,53 @@ module Riemann
     class PluginManager
 
       include Riemann::Babbler::Logging
-
-      attr_accessor :sender
+      include Riemann::Babbler::Errors
 
       def initialize(sender, array_of_klasses)
         @plugins = array_of_klasses
         @sender  = sender
+        @mapping = Hash.new
       end
 
       def run!
-        hash_of_plugins_and_threads = Hash.new
-        @plugins.map do |plugin|
 
+        @plugins.map do |plugin|
           unless plugin.new(@sender).send(:run_plugin)
             log :unknown, "Disable plugin: #{plugin}, because it not started by condition: run_plugin"
             next
           end
-
-          hash_of_plugins_and_threads[plugin] = Thread.new {
-            log :unknown, "Start plugin #{plugin}"
-            plugin.new(@sender).run!
-          }
-
+          @mapping[plugin] = run_thread(plugin)
         end
 
-        Signal.trap 'TERM' do
-          hash_of_plugins_and_threads.values.each(&:kill)
+        loop do
+          check_alive
+          sleep 10
         end
+      end
 
-        loop {
-          check_alive(hash_of_plugins_and_threads)
-          sleep 10
+      def run_thread(plugin)
+        Thread.new {
+          log :unknown, "Start plugin #{plugin}"
+          plugin.new(@sender).run!
+          Signal.trap('TERM') do
+            shutdown
+          end
         }
       end
 
-      def check_alive(hash_of_plugins_and_threads)
-        log :debug, "Check alive of threads [#{hash_of_plugins_and_threads.count}]"
-        hash_of_plugins_and_threads.each do |plugin, thread|
+      def check_alive
+        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..."
-          hash_of_plugins_and_threads[plugin] = Thread.new {
-            plugin.new(@sender).run!
-          }
+          @mapping[plugin] = run_thread(plugin)
         end
       end
 
+      def shutdown
+        exit Errors::USER_CALL_SHUTDOWN
+      end
+
     end
   end
 end

data/lib/riemann/babbler/plugins/responder.rb

@@ -15,14 +15,24 @@ class Riemann::Babbler::Plugin::Responder < Riemann::Babbler::Plugin
         :uptime  => Time.now.to_i - plugin.started_at,
         :errors  => opts.errors.to_hash,
         :config  => opts.riemann.to_hash
-    }
+    }.to_json
+  end
+
+  def status_ok
+    {:status => 'ok'}.to_json
   end
 
   def run!
     log :unknown, "Start responder 0.0.0.0:#{plugin.port}"
     ::Net::HTTP::Server.run(:port => plugin.port) do |request, _|
       log :debug, "Responder request: #{request}"
-      [200, { 'Content-Type' => 'application/json' }, [info.to_json]]
+      case
+        when request[:uri][:path] == "/kill" #&& request[:method] == "POST"
+          [200, { 'Content-Type' => 'application/json' }, [status_ok]]
+          Process.kill('TERM', $$)
+      else
+        [200, { 'Content-Type' => 'application/json' }, [info]]
+      end
     end
   end
 

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.0.0pre13'
+    VERSION = '2.0.0pre15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.0.0pre13
+  version: 2.0.0pre15
   prerelease: 5
 platform: ruby
 authors:
@@ -306,7 +306,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4537148055138242403
+      hash: 3173648175310025004
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: