buffered-logger 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24814e281866d206c20b1ab4826011c242388f09
-  data.tar.gz: 187721e040994930211c3a08ffcc3cdc4761ddda
+  metadata.gz: 6b22772662c4a00e7c497ccde9cfa8be61cd66c6
+  data.tar.gz: 00658ed94b4dcdf3d318eaca0eb53c6e3306510c
 SHA512:
-  metadata.gz: ca6cd186fb7a430f22c62f96eb282d665ee6cca36c5746b96e31697242d6394b0124d5635378e422ccbb564387af97262dcdc3d8befb358afd11d1818210414b
-  data.tar.gz: 748a9b6f43f68beee1bfc6dc4fea62884fa2e22f16324e04e73313824b7e76015f974336e24139442fdae1ac823260ca5db1f866da2e4f0a06df3cd3977cc008
+  metadata.gz: 1a4f915cde421f9af0b57ad267270c980938b16f576421e516221e0e41dd60fec63539895efce09d926590d3b1abf5acd40d18612ef29b6cf65e7e192428830e
+  data.tar.gz: 8d08829ec1ff7ce51733142f03b544433450a88cd9f1f81cba8d289cbb65e4aeaf4cffc8fb82e3350822767152a3466851e19bc2b5dd2c3653b186ed5abae275

data/lib/buffered_logger.rb

@@ -6,18 +6,14 @@ class BufferedLogger < ::Logger
   require "buffered_logger/middleware"
   require "buffered_logger/version"
 
-  attr_accessor :sweep_frequency
-
   def initialize(*)
     super
     @logdev = LogDeviceProxy.new(@logdev)
-    self.sweep_frequency = 0.02
   end
 
   def end
     raise NotStartedError, "not started" unless started?
     @logdev.end
-    sweep if rand <= sweep_frequency
     nil
   end
 
@@ -44,10 +40,6 @@ class BufferedLogger < ::Logger
     @logdev.started?
   end
 
-  def sweep
-    @logdev.sweep
-  end
-
   def current_log
     @logdev.current_log
   end

data/lib/buffered_logger/log_device_proxy.rb

@@ -2,9 +2,11 @@ require "thread"
 
 class BufferedLogger
   class LogDeviceProxy
+    THREAD_LOCAL_VAR_NAME = :"BufferedLogger::LogDeviceProxy::string_io"
+
     def initialize(logdev)
       @logdev = logdev
-      @buffers = {}
+      destroy_thread_local
     end
 
     def close
@@ -12,44 +14,46 @@ class BufferedLogger
     end
 
     def end
-      @logdev.write(@buffers.delete(key).string)
+      @logdev.write(string_io.string)
+      destroy_thread_local
     end
 
     def flush
-      log, @buffers[key] = @buffers.delete(key).string, StringIO.new
-      @logdev.write(log)
+      @logdev.write(string_io.string)
+      string_io.string.clear
     end
 
     def start
-      @buffers[key] = StringIO.new
+      self.string_io = StringIO.new
     end
 
     def started?
-      @buffers.key?(key)
-    end
-
-    def sweep
-      @buffers.clone.each do |key, buffer|
-        @buffers.delete(key) unless key.all?(&:alive?)
-      end
-      true
+      !!string_io
     end
 
     def write(message)
       if started?
-        @buffers[key].write(message)
+        string_io.write(message)
       else
         @logdev.write(message)
       end
     end
 
     def current_log
-      @buffers[key].string.dup
+      string_io.string.dup
     end
 
     private
-      def key
-        [Thread.current]
-      end
+    def string_io
+      Thread.current.thread_variable_get(THREAD_LOCAL_VAR_NAME)
+    end
+
+    def string_io=(string_io)
+      Thread.current.thread_variable_set(THREAD_LOCAL_VAR_NAME,string_io)
+    end
+
+    def destroy_thread_local
+      self.string_io = nil
+    end
   end
 end

data/lib/buffered_logger/version.rb

@@ -1,5 +1,5 @@
 require "logger"
 
 class BufferedLogger < Logger
-  VERSION = "1.2.2"
+  VERSION = "2.0.0"
 end

data/test/buffered_logger/log_device_proxy_slow_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+describe "BufferedLogger::LogDeviceProxy slow tests" do
+  before do
+    @logdev = mock()
+    @proxy = BufferedLogger::LogDeviceProxy.new(@logdev)
+  end
+
+  describe "flush" do
+    it "should handle multiple thread simutaneously calling it" do
+      @logdev.stubs(:write)
+
+      8.times do |iteration|
+        threads = []
+        8.times do
+          threads << Thread.new do
+            (iteration * 10_000).times do
+              @proxy.start
+              @proxy.flush
+              @proxy.end
+            end
+          end
+        end
+        threads.each { |thr| thr.join }
+      end
+    end
+  end
+end

data/test/buffered_logger/log_device_proxy_test.rb

@@ -58,31 +58,4 @@ describe BufferedLogger::LogDeviceProxy do
     @proxy.write("2")
     assert_equal "12", @proxy.current_log
   end
-
-  describe "sweep" do
-    it "should check if the thread is alive" do
-      thread = mock()
-      thread.expects(:alive?).returns(true)
-      Thread.stubs(:current).returns(thread)
-
-      @proxy.start
-      @proxy.sweep
-    end
-
-    it "should remove dead threads or fibers" do
-      thread = mock()
-      thread.stubs(:alive?).returns(true)
-      Thread.stubs(:current).returns(thread)
-
-      @proxy.start
-      @proxy.sweep
-      assert @proxy.started?, "Proxy is not started"
-
-      thread.stubs(:alive?).returns(false)
-
-      @proxy.start
-      @proxy.sweep
-      assert !@proxy.started?, "Proxy is started"
-    end
-  end
 end

data/test/buffered_logger_slow_test.rb

@@ -0,0 +1,23 @@
+require "test_helper"
+
+describe "BufferedLogger slow tests" do
+  before do
+    @buffer = StringIO.new
+    @logger = BufferedLogger.new(@buffer)
+  end
+
+  it "should handle multiple thread simutaneously calling start with a block" do
+    16.times do
+      threads = []
+      8.times do
+        threads << Thread.new do
+          32768.times do
+            @logger.start {}
+          end
+        end
+      end
+      threads.each { |thr| thr.join }
+      sleep(0.01 * rand)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buffered-logger
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Samuel Kadolph
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -55,8 +55,10 @@ files:
 - lib/buffered_logger/middleware.rb
 - lib/buffered_logger/rails.rb
 - lib/buffered_logger/version.rb
+- test/buffered_logger/log_device_proxy_slow_test.rb
 - test/buffered_logger/log_device_proxy_test.rb
 - test/buffered_logger/middleware_test.rb
+- test/buffered_logger_slow_test.rb
 - test/buffered_logger_test.rb
 homepage: http://samuelkadolph.github.com/buffered-logger/
 licenses: []
@@ -69,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -77,12 +79,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: buffered-logger is a concurrency safe logger. It buffers each logging statement
   and writes to the log file all at once.
 test_files:
+- test/buffered_logger/log_device_proxy_slow_test.rb
 - test/buffered_logger/log_device_proxy_test.rb
 - test/buffered_logger/middleware_test.rb
+- test/buffered_logger_slow_test.rb
 - test/buffered_logger_test.rb