kurchatov 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e1d34d6fcb98e1be197acf85a0bd17d91a0e4e
-  data.tar.gz: 6e6047fd40b42401815a712d40b9b84c48e6fddb
+  metadata.gz: 2ab33b41289659f97c0ab56f2354b00607bc4fb2
+  data.tar.gz: 0d70dc7aa2e4063f6620dd5f4d9e712ea1c2d22f
 SHA512:
-  metadata.gz: 2d601d6e41e5e6102389b6a39ecb36aa1eea9fbb683959ca77b3f946248990afd7bbc033519407c480070a3645237e97bad8996572d31c5213506ff45358d298
-  data.tar.gz: 001ea41bc352f5acd2d63399b502c49c1625da3aebd6f267c4e5d0cf8b4ddb0fac3a4e75776721f8ed77e558f6b0e7e1784ede8068adf58e39f546619cfccb92
+  metadata.gz: 8851e6778223f849cc6de3b55e1b62c881b1608699f50adcef48463bad5d336fb80e9635d7f69a9648b8a2e81da730bbeffab193e5382fcc78c4863f518f4611
+  data.tar.gz: dbd8638280ef6935223c796ffc4ab4ce14771129c12455ba46d9df8637dcbabdcc49b01e175b09cf535f1775b07fe80095b07bd640f74a7ca6e6eae5171e4c99

data/lib/kurchatov/application.rb

@@ -92,6 +92,10 @@ module Kurchatov
            :long => '--http-transport http://server:port/api',
            :description => 'Set http server for send events'
 
+    option :nsjson_transport,
+           :long => '--nsjson-transport server:port',
+           :description => 'Set line json reciever for send events'
+
     option :http_responder,
            :long => '--http 0.0.0.0:55755',
            :description => 'Set http responder for information'

data/lib/kurchatov/responders/ndjson_transport.rb

@@ -4,9 +4,6 @@ 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
@@ -14,46 +11,28 @@ 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
+    @tcpsocket ||= TCPSocket.new(plugin.host, plugin.port.to_i)
     @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
+      Log.info("Message: #{@message}")
+      mutex.synchronize { @tcpsocket.puts(@message) }
     end
     @events_to_send = nil
   end
 
+  def flush_or_exit
+    flush rescue (exit 99)
+  end
+
 end
 
 run do
-  loop { flush; sleep 1 }
+  Log.info("Start with #{plugin.host}:#{plugin.port}")
+  loop { flush_or_exit; sleep 1 }
 end

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake