vx-lib-logger 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3340d7bb77543987056799ba4fcc7e4dbae644e0
-  data.tar.gz: 6796b3c63a27940229fbabaca2a0635fc85fa076
+  metadata.gz: 15da1aa320c8738cfa0e523bbebe859987594ec3
+  data.tar.gz: b807b4761bd2dccce15e79769fc685f7676c2c26
 SHA512:
-  metadata.gz: 5dc46049feeeeed35209d04eb75eedc967a437c34d12ae3b1d0f0c428463860f5275c04eb11674d4ba9dfbdce3b788be2d6e862672a8ad9499f95be417e377e5
-  data.tar.gz: 6144d060bf2b467c589d632f70c33887655afca47667cf1898370992cc80b51c9ec08363c75e302ba64213f5f9a07bddc398aeaf6a13a81cae5fcc41829756e0
+  metadata.gz: 3143fc65c2f6c2deb2ddbbe79e9ec00092355d8a518ec4d63f0af5a7cc425671fa28b2ae1b8cece4799db18c10969c76494140ee6f7c2ebbfb97e32dd3099870
+  data.tar.gz: fda5e4ee713cd2f4941c7afcd41db81a428a05ec99da21ab318606b7ed631bb84e751f9cc6ea7e2fafcc67028bf1c4169b2ad9ec3404f7c5fcbc8c3a044eab08

data/lib/vx/lib/logger/logstash_device.rb

@@ -8,13 +8,15 @@ module Vx ; module Lib ; module Logger
 
     def initialize
       @mutex = Mutex.new
+      @queue = Queue.new
     end
 
     def uri
-      @uri ||= begin
-        h = ENV['LOGSTASH_HOST']
-        URI("logstash://#{h}") if h
-      end
+      @uri ||=
+        begin
+          h = ENV['LOGSTASH_HOST']
+          URI("logstash://#{h}") if h
+        end
     end
 
     def enabled?
@@ -39,9 +41,8 @@ module Vx ; module Lib ; module Logger
 
     def write(message)
       if enabled?
-        with_connection do
-          @io.write message
-        end
+        logger_thread
+        @queue.push message
       end
     end
 
@@ -51,40 +52,50 @@ module Vx ; module Lib ; module Logger
       end
     end
 
-    private
-
-      def host
-        uri.host
+    def wait
+      while !@queue.empty?
+        sleep 0.1
       end
+    end
 
-      def port
-        @port ||= uri.port || 514
+    def logger_thread
+      @logger_loop ||= Thread.new do
+        loop do
+          m = @queue.pop
+          with_connection do
+            @io.write m
+          end
+        end
       end
+    end
 
-      def warn(msg)
-        $stderr.puts "[warn ] #{msg}"
-      end
+    private
 
-      def with_connection(&block)
-        @mutex.synchronize do
-          connect unless connected?
-        end
-        yield
-      rescue Exception => e
-        warn "#{self.class} - #{e.class} - #{e.message}"
-        close
-      end
+    def host
+      uri.host
+    end
 
-      def reconnect
-        @io = nil
-        connect
-      end
+    def port
+      @port ||= uri.port || 514
+    end
 
-      def connect
-        @io = TCPSocket.new(host, port).tap do |socket|
-          socket.sync = true
-        end
+    def warn(msg)
+      $stderr.puts "[warn ] #{msg}"
+    end
+
+    def with_connection(&block)
+      connect unless connected?
+      yield
+    rescue Exception => e
+      warn "#{self.class} - #{e.class} - #{e.message}"
+      close
+    end
+
+    def connect
+      @io = TCPSocket.new(host, port).tap do |socket|
+        socket.sync = true
       end
+    end
 
   end
 

data/lib/vx/lib/logger/logstash_logger.rb

@@ -20,6 +20,10 @@ module Vx ; module Lib ; module Logger
       logstash_device.close
     end
 
+    def wait
+      logstash_device.wait
+    end
+
     private
 
       def logstash_device

data/lib/vx/lib/logger/version.rb

@@ -1,7 +1,7 @@
 module Vx
   module Lib
     module Logger
-      VERSION = "0.3.6"
+      VERSION = "0.3.7"
     end
   end
 end

data/spec/lib/logstash_device_spec.rb

@@ -16,7 +16,7 @@ describe Vx::Lib::Logger::LogstashDevice do
       log.write("Hello\n")
       log.close
     end
-    assert_equal re, "Hello\n"
+    assert_equal "Hello\n", re
   end
 
   it "should successfuly lost connection" do
@@ -24,18 +24,20 @@ describe Vx::Lib::Logger::LogstashDevice do
 
     re = with_socket do
       log.write("Hello\n")
-      log.close
+      with_timeout { log.wait }
     end
+    log.close
 
     log.write("Lost\n")
+    with_timeout { log.wait }
 
     re << with_socket do
       log.write("World\n")
+      with_timeout { log.wait }
     end
-
     log.close
 
-    assert_equal re, "Hello\nWorld\n"
+    assert_equal "Hello\nWorld\n", re
   end
 
 

data/spec/lib/logstash_logger_spec.rb

@@ -17,6 +17,7 @@ describe Vx::Lib::Logger::LogstashLogger do
     it "should write #{m} message" do
       re = with_socket do
         @log.public_send(m, "send #{m}")
+        @log.wait
         @log.close
       end
       assert_match(/send #{m}/, re)
@@ -26,6 +27,7 @@ describe Vx::Lib::Logger::LogstashLogger do
   it "should write message with params" do
     re = with_socket do
       @log.info "text message", param: :value
+      @log.wait
       @log.close
     end
     assert_match(/text message/, re)
@@ -36,6 +38,7 @@ describe Vx::Lib::Logger::LogstashLogger do
   it "should write message with exception in params" do
     re = with_socket do
       @log.info "text message", exception: Exception.new("got!")
+      @log.wait
       @log.close
     end
     assert_match(/text message/, re)
@@ -46,6 +49,7 @@ describe Vx::Lib::Logger::LogstashLogger do
   it "should dump invalid unicode key" do
     re = with_socket do
       @log.info "Le Caf\xc3\xa9 \xa9", key: "Le Caf\xc3\xa9 \xa9"
+      @log.wait
       @log.close
     end
     assert_match(/Le Caf/, re)

data/spec/spec_helper.rb

@@ -2,6 +2,11 @@ require File.expand_path("../../lib/vx/lib/logger", __FILE__)
 
 require 'minitest/spec'
 require 'minitest/autorun'
+require 'timeout'
+
+def with_timeout(tm=3)
+  Timeout.timeout(tm) { yield }
+end
 
 def with_socket
   out  = ""
@@ -9,9 +14,10 @@ def with_socket
 
   th = Thread.new do
     loop do
-      client = server.accept
-      out << client.gets
-      client.close
+      Thread.fork(server.accept) do |client|
+        out << client.gets
+        client.close
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-lib-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Dmitry Galinsky