vx-lib-logger 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e26de45693231b2c8197c8929a8a0c0d5c3d592c
-  data.tar.gz: 88307e1e931f192dd164e5916da100eb0d84fc83
+  metadata.gz: 2dea1390dc5c902ae600c1bcb84384ad3267051c
+  data.tar.gz: 4409bc16d3e05078667782762bcd4a74dd6585bd
 SHA512:
-  metadata.gz: f43aae69572e7752c0110ea5c7b22140a83a1ff08cdbbe08641b241ff9ab733c052c85b56fe3e8ae5a1b688ff4db80017700aa32cf4aaafd0de9a76f5d766d0a
-  data.tar.gz: 7620316be2c65de75f8a8f81aa75639c841ffab95d15a2a642fc032793c068e4422ec591505d65556ba92bcb9627beb2a8599c3998e69d5352841822ac78cb43
+  metadata.gz: 598e0782b467101c053444c70b1d80313237d92a8a51372b1149e0c8d8fe82dfe214ab5e7484400cca31362ac5951aae43aea90acbf83418eb4eac115aba9559
+  data.tar.gz: bbd5a90922d82352bc070b205b12a0f587a2a829433e776d3105a958f4767840ad2c7e393c92af36cbc1685354c9f28f706bdf3b3add0af1d514129768b76fb1

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

@@ -8,6 +8,7 @@ module Vx ; module Lib ; module Logger
 
     def initialize
       @mutex = Mutex.new
+      @queue = Queue.new
     end
 
     def uri
@@ -35,16 +36,34 @@ module Vx ; module Lib ; module Logger
 
     def write(message)
       if enabled?
-        @mutex.synchronize do
+        main_thread
+        @queue.push message
+      end
+    end
+
+    def flush
+      @io && @io.flush
+    end
+
+    def main_thread
+      @main_thread ||= Thread.new do
+        loop do
           with_connection do
-            @io.write message
+            @io.write @queue.pop
           end
         end
       end
     end
 
-    def flush
-      @io && @io.flush
+    def close_main_thread
+      @main_thread && (
+        @main_thread.kill
+        @main_thread = nil
+      )
+    end
+
+    def empty?
+      @queue.empty?
     end
 
     private
@@ -62,12 +81,16 @@ module Vx ; module Lib ; module Logger
       end
 
       def with_connection(&block)
-        connect unless connected?
-        yield
-      rescue Exception => e
-        warn "#{self.class} - #{e.class} - #{e.message}"
-        close
-        @io = nil
+        begin
+          if enabled?
+            connect unless connected?
+            yield
+          end
+        rescue Exception => e
+          warn "#{self.class} - #{e.class} - #{e.message}"
+          close
+          @io = nil
+        end
       end
 
       def reconnect

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

@@ -20,11 +20,11 @@ module Vx ; module Lib ; module Logger
       logstash_device.close
     end
 
-    private
+    def logstash_device
+      Lib::Logger.logstash_device
+    end
 
-      def logstash_device
-        Lib::Logger.logstash_device
-      end
+    private
 
       def format_message(level, message, payload)
         LogstashFormatter.call(level, progname, message, payload)

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

@@ -1,7 +1,7 @@
 module Vx
   module Lib
     module Logger
-      VERSION = "0.3.3"
+      VERSION = "0.3.4"
     end
   end
 end

data/spec/lib/logstash_device_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'timeout'
 
 describe Vx::Lib::Logger::LogstashDevice do
 
@@ -19,6 +20,25 @@ describe Vx::Lib::Logger::LogstashDevice do
     assert_equal re, "Hello\n"
   end
 
+  it "should successfuly write in multhreaded" do
+    re = with_socket do
+      log = Vx::Lib::Logger::LogstashDevice.new
+      ths = (0...3).to_a.map do |n|
+        Thread.new do
+          log.write("Hello\n")
+        end
+      end
+      ths.map(&:join)
+      Timeout.timeout(3) do
+        while !log.empty?
+          sleep 0.1
+        end
+      end
+      log.close
+    end
+    assert_equal "Hello\n" * 10, re
+  end
+
   it "should successfuly lost connection" do
     log = Vx::Lib::Logger::LogstashDevice.new
 
@@ -27,15 +47,33 @@ describe Vx::Lib::Logger::LogstashDevice do
       log.close
     end
 
+    Timeout.timeout(3) do
+      while !log.empty?
+        sleep 0.1
+      end
+    end
+
     log.write("Lost\n")
 
+    Timeout.timeout(3) do
+      while !log.empty?
+        sleep 0.1
+      end
+    end
+
     re << with_socket do
       log.write("World\n")
     end
 
+    Timeout.timeout(3) do
+      while !log.empty?
+        sleep 0.1
+      end
+    end
+
     log.close
 
-    assert_equal re, "Hello\nWorld\n"
+    assert_equal "Hello\nWorld\n", re
   end
 
 

data/spec/lib/logstash_logger_spec.rb

@@ -19,6 +19,7 @@ describe Vx::Lib::Logger::LogstashLogger do
         @log.public_send(m, "send #{m}")
         @log.close
       end
+      @log.logstash_device.close_main_thread
       assert_match(/send #{m}/, re)
     end
   end

data/spec/spec_helper.rb

@@ -2,25 +2,32 @@ require File.expand_path("../../lib/vx/lib/logger", __FILE__)
 
 require 'minitest/spec'
 require 'minitest/autorun'
+require 'thread'
 
 def with_socket
-  out  = ""
+  out    = ""
   server = TCPServer.new 9999
+  lock   = Mutex.new
 
-  th = Thread.new do
-    loop do
-      client = server.accept
-      out << client.gets
-      client.close
+  ths = (0..10).to_a.map do |n|
+    Thread.new do
+      loop do
+        client = server.accept
+        lock.synchronize do
+          out << client.gets
+          puts "#{n}: !!!#{out}!!!"
+          client.close
+        end
+      end
     end
   end
 
   begin
     yield
-    sleep 0.2
+    sleep 10
     out
   ensure
-    th.kill
+    ths.map(&:kill)
     server.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-lib-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj