vx-lib-logger 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dea1390dc5c902ae600c1bcb84384ad3267051c
-  data.tar.gz: 4409bc16d3e05078667782762bcd4a74dd6585bd
+  metadata.gz: 9fc76156b0ca24dee245c5b6681f03462a95cbc6
+  data.tar.gz: 9120d85a12ad8d059e1a74afb24b5293d2b04ea1
 SHA512:
-  metadata.gz: 598e0782b467101c053444c70b1d80313237d92a8a51372b1149e0c8d8fe82dfe214ab5e7484400cca31362ac5951aae43aea90acbf83418eb4eac115aba9559
-  data.tar.gz: bbd5a90922d82352bc070b205b12a0f587a2a829433e776d3105a958f4767840ad2c7e393c92af36cbc1685354c9f28f706bdf3b3add0af1d514129768b76fb1
+  metadata.gz: bd48fb6e83d24e0216a8db4cad894ad7c5bc3d54e153cf46458fb5472be1dfd8eea565b7e27dbd7031ca099272310aff9ef695d4765d2238bbeb13c5917f5f0e
+  data.tar.gz: 8525d010e4f916d60c1e58ea8052f417748c47a93a3b1ee28cf63264b325803321969a40b427110250bdaaeaece39aa6439f126a61d747c26605c2554b5e2083

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

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

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

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

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

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

data/spec/lib/logstash_device_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'timeout'
 
 describe Vx::Lib::Logger::LogstashDevice do
 
@@ -20,25 +19,6 @@ 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
 
@@ -47,33 +27,15 @@ 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 "Hello\nWorld\n", re
+    assert_equal re, "Hello\nWorld\n"
   end
 
 

data/spec/lib/logstash_logger_spec.rb

@@ -19,7 +19,6 @@ 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,32 +2,25 @@ 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
 
-  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
+  th = Thread.new do
+    loop do
+      client = server.accept
+      out << client.gets
+      client.close
     end
   end
 
   begin
     yield
-    sleep 10
+    sleep 0.2
     out
   ensure
-    ths.map(&:kill)
+    th.kill
     server.close
   end
 end

metadata

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