kurchatov 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d32e4c6e47ad7cd5c109519c4c6bcaf72617be4
-  data.tar.gz: 8f2184acdc5c63422dc7aeb09403715f37254d13
+  metadata.gz: 752d3c7c9f2993350889451956a8705c50999bd8
+  data.tar.gz: 98ba3a8b8027decc9f88679732ca61fcc5a6c2c2
 SHA512:
-  metadata.gz: c1f347fff73715f15d5327249099bd09e793a177d357d801c535caa3bbcff65a5c0371b7e82505b2ec6556181cbc22e7e98e3c001045b76331a8f144ddf6e33f
-  data.tar.gz: 6b46ec7ee3a15d023d941a0e16bfb6bf6ccb468def4573de66cea400c33e803169ee568874d6f1f0568625fe826185c9539012e623575127c84c18d6208ad33a
+  metadata.gz: 56ad4cb255578bda435c63a008b44a1b15d520c79aa29f1c02a2daabe286331bf019b5e0b411e30d1e6c4af57df6166863d05b217e44518676a217e48e1d2817
+  data.tar.gz: 8af9c9a40b6cd0682ed1efdbf98cfaa194fa348c66dbe76de3c42f7acccf3aba0d17261fdf36a8d620674c6c6b9b3573d9c982cb9c9fd255f26a5f387a346ab2

data/.gitignore

@@ -17,3 +17,4 @@ rdoc
 spec/reports
 tmp
 dpkg
+tests/tank*.rb

data/lib/kurchatov/application.rb

@@ -124,7 +124,9 @@ module Kurchatov
 
     def configure_test_plugin
       return unless Config[:test_plugin]
-      monitor << Kurchatov::Plugins::DSL.load_riemann_plugin(Config[:test_plugin])
+      plugins = Kurchatov::Plugins::Config.load_test_plugin(Config[:test_plugin],
+                                                        Config[:config_file])
+      plugins.each {|p| monitor << p}
     end
 
     def run
@@ -134,7 +136,7 @@ module Kurchatov
       load_plugins(File.join(File.dirname(__FILE__),'responders'))
       load_plugins(Config[:plugin_paths])
       configure_test_plugin
-      monitor.start
+      monitor.start!
     end
 
   end

data/lib/kurchatov/monitor.rb

@@ -8,7 +8,7 @@ module Kurchatov
 
       def initialize(plugin)
         @plugin = plugin
-        @thread = Thread.new { @plugin.start }
+        @thread = Thread.new { @plugin.start! }
         @count_errors = 0
         @last_error = nil
         @last_error_at = nil
@@ -22,6 +22,14 @@ module Kurchatov
         @plugin.plugin_config
       end
 
+      def stop!
+        Thread.kill(@thread)
+      end
+
+      def stopped?
+        @plugin.stopped?
+      end
+
       def died?
         return false if @thread.alive?
         # thread died, join and extract error
@@ -57,9 +65,17 @@ module Kurchatov
       @tasks << Task.new(plugin)
     end
 
-    def start
+    def start!
       loop do
-        @tasks.each { |t| exit Config[:ERROR_PLUGIN_REQ] if t.died? && @stop_on_error }
+        @tasks.each do |task|
+          if task.died? && @stop_on_error
+            exit(Config[:ERROR_PLUGIN_REQ])
+          end
+          if task.stopped?
+            task.stop!
+            @tasks.delete(task)
+          end
+        end
         Log.debug("Check alive plugins [#{@tasks.count}]")
         sleep CHECK_ALIVE_TIMEOUT
       end

data/lib/kurchatov/plugin/config.rb

@@ -6,6 +6,13 @@ module Kurchatov
   module Plugins
     module Config
 
+      def self.load_test_plugin(plugin_path, config_file)
+        config = File.exists?(config_file) ? YAML.load_file(config_file) : {}
+        plugin = Kurchatov::Plugins::DSL.load_riemann_plugin(plugin_path)
+        plugin.plugin.merge!(config[plugin.name]) unless config.empty?
+        [plugin]
+      end
+
       def self.find_plugin(name, array)
         array.find { |p| p.name == name }
       end

data/lib/kurchatov/plugin/riemann.rb

@@ -33,7 +33,7 @@ module Kurchatov
         plugin
       end
 
-      def start
+      def start!
         super
         run.nil? ? start_collect : start_run
       end

data/lib/kurchatov/plugin.rb

@@ -7,12 +7,20 @@ module Kurchatov
       @name = name
       @ignore_errors = false
       @always_start = false
+      @stopped = false
     end
 
-    def start
-      #
+    def start!
+      return if @stopped
     end
 
+    def stop!
+      @stopped = true
+    end
+
+    def stopped?
+      @stopped
+    end
 
   end
 end

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake