kurchatov 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882843085745f7e2cbe6d86c71579c2bbd94fd71
-  data.tar.gz: 7d87f910409e109272296cec7a99a994b4075909
+  metadata.gz: 03637929698462ddf10999615c44bf1abbfdf764
+  data.tar.gz: a6b8925c35795c75e2e62d66e4da4aeef628742a
 SHA512:
-  metadata.gz: d2eb1257a80ecb9ebf4e8c779e5bbe07bd32f2517929445feebd9bb7f17f04cc9af2baf16a81581962a48d96241862895ae5068c3fb36c5b192090f7b46cc042
-  data.tar.gz: 4080fa6689cb734639670dc8f11073955e17ca8acefa3f99f8ca563edd60ddde979c7ba0701f9440ce8ae0cb2133d3a752512680e10b5ebbadb6e10e9f3b5504
+  metadata.gz: f64e8e4e28beb87c3bfac265c11d5ecb6f7d135b56f72b331bdb3f7fac7047c079bb1fabe0cadeffba103b7ae432a250897a0f79b14f1530c61167c5135d6905
+  data.tar.gz: b3189a467b0e43b7ec2a745366c6f53401c71513c8c8014f346750a00d42f39646a830b932edf669aaf80e48ab057a1cb32a7d1eb306b97cb4f41e0dc3420506

data/app/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "kurchatov", "= 0.3.8"
+gem "kurchatov", "= 0.4.1"
 gem "beefcake", "=0.5.0"
 gem "sys-filesystem"
 gem "sys-proctable"

data/app/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
     file-tail (1.0.12)
       tins (~> 0.5)
     ipaddress (0.8.0)
-    kurchatov (0.3.8)
+    kurchatov (0.4.1)
       beefcake (>= 0.3.5)
       ohai
     libyajl2 (1.0.1)
@@ -54,7 +54,7 @@ DEPENDENCIES
   beefcake (= 0.5.0)
   ffi-rzmq
   file-tail
-  kurchatov (= 0.3.8)
+  kurchatov (= 0.4.1)
   net-ntp
   net-ping
   parallel

data/debian/changelog

@@ -1,3 +1,9 @@
+riemann-client (1:0.4.1) stable; urgency=low
+
+  * Bump.
+
+ -- Undev DevOps Team <devops@undev.ru>  Mon, 15 Dec 2014 19:17:12 +0300
+
 riemann-client (1:0.4.0) stable; urgency=low
 
   * Http transport.

data/lib/kurchatov/application.rb

@@ -36,7 +36,7 @@ module Kurchatov
            :short => '-l LEVEL',
            :long => '--log_level LEVEL',
            :description => 'Set the log level (debug, info, warn, error, fatal)',
-           :proc => lambda { |l| l.to_sym }
+           :proc => lambda { |l| l.downcase.to_sym }
 
     option :log_location,
            :short => '-L LOGLOCATION',

data/lib/kurchatov/config.rb

@@ -3,8 +3,8 @@ module Kurchatov
     extend Mixlib::Config
     default :log_level, :info
     default :log_location, STDERR
-    default :plugin_paths, ['/usr/share/kurchatov/plugins']
-    default :config_file, '/etc/kurchatov/config.yml'
+    default :plugin_paths, ['/usr/share/riemann-client/plugins']
+    default :config_file, '/etc/riemann-client/config.yml'
     # errors
     default :ERROR_CONFIG, 2
   end

data/lib/kurchatov/plugin/config.rb

@@ -24,6 +24,7 @@ module Kurchatov
         @all_names = Array.new
         @plugins_to_run = Array.new
         config = YAML.load_file(config_file)
+        config = {} and Log.info("Empty config file '#{config_file}'") if config == false
         config.each do |name, val|
           @all_names << name
           next if val.nil?

data/lib/kurchatov/responders/ndjson_transport.rb

@@ -0,0 +1,59 @@
+name 'new line delimeter json transport'
+
+always_start true
+ignore_errors true
+
+default[:host], default[:port] = Kurchatov::Config[:nsjson_transport].to_s.split(":")
+default[:connect_timeout] = 1
+default[:send_timeout] = 1
+default[:exit_on_disconnect] = true
+
+run_if do
+  !!plugin.host
+end
+
+helpers do
+
+  def if_error
+    if plugin.exit_on_disconnect
+      Log.error("Socket #{plugin.host}:#{plugin.port} (#{@socket.inspect}) write error, exit..")
+      exit 99
+    end
+    nil
+  end
+
+  def connect
+    Timeout::timeout(plugin.connect_timeout) {
+      @socket ||= (TCPSocket.new(plugin.host, plugin.port) rescue if_error)
+    }
+  end
+
+  def mutex
+    @mutex ||= Mutex.new
+  end
+
+  def with_connection
+    mutex.synchronize do
+      yield(@socket || connect)
+    end
+  end
+
+  def flush
+    @events_to_send ||= events.to_flush
+    if !@events_to_send.empty?
+      @message = {"events" => @events_to_send}.to_json
+      Log.debug("Message: #{@message}")
+      with_connection do |socket|
+        Timeout::timeout(plugin.send_timeout) {
+          socket.puts(@message)
+        } rescue if_error
+      end
+    end
+    @events_to_send = nil
+  end
+
+end
+
+run do
+  loop { flush; sleep 1 }
+end

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -177,6 +177,7 @@ files:
 - lib/kurchatov/queue.rb
 - lib/kurchatov/responders/http_server.rb
 - lib/kurchatov/responders/http_transport.rb
+- lib/kurchatov/responders/ndjson_transport.rb
 - lib/kurchatov/responders/riemann_transport.rb
 - lib/kurchatov/responders/udp_server.rb
 - lib/kurchatov/riemann/client.rb