buffered-logger 1.0.1 → 1.0.3

data/lib/buffered-logger.rb

@@ -0,0 +1 @@
+require "buffered_logger"

data/lib/buffered_logger/log_device_proxy.rb

@@ -1,3 +1,6 @@
+require "fiber"
+require "thread"
+
 class BufferedLogger
   class LogDeviceProxy
     def initialize(logdev)
@@ -10,23 +13,35 @@ class BufferedLogger
     end
 
     def end
-      @logdev.write(@buffers.delete(Thread.current).string)
+      @logdev.write(@buffers.delete(key).string)
     end
 
     def start
-      @buffers[Thread.current] = StringIO.new
+      @buffers[key] = StringIO.new
     end
 
     def started?
-      @buffers.key?(Thread.current)
+      @buffers.key?(key)
+    end
+
+    def sweep
+      @buffers.keep_if do |key, buffer|
+        key.all?(&:alive?)
+      end
+      true
     end
 
     def write(message)
       if started?
-        @buffers[Thread.current].write(message)
+        @buffers[key].write(message)
       else
         @logdev.write(message)
       end
     end
+
+    private
+      def key
+        [Thread.current, Fiber.current]
+      end
   end
 end

data/lib/buffered_logger/rails.rb

@@ -4,6 +4,8 @@ require "rails"
 class BufferedLogger
   class Railtie < Rails::Railtie
     initializer :buffered_logger, :before => :initialize_logger do |app|
+      next if app.config.logger
+
       if Rails::VERSION::STRING >= "3.1"
         path = app.paths["log"].first
       else

data/lib/buffered_logger/version.rb

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

data/lib/buffered_logger.rb

@@ -6,14 +6,19 @@ 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
 
   def start(&block)
@@ -34,4 +39,8 @@ class BufferedLogger < Logger
   def started?
     @logdev.started?
   end
+
+  def sweep
+    @logdev.sweep
+  end
 end

data/test/buffered_logger/log_device_proxy_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe BufferedLogger::LogDeviceProxy do
-  def setup
+  before do
     @logdev = mock()
     @proxy = BufferedLogger::LogDeviceProxy.new(@logdev)
   end
@@ -42,4 +42,38 @@ describe BufferedLogger::LogDeviceProxy do
     @proxy.write("3")
     @proxy.end
   end
+
+  describe "sweep" do
+    it "should check if the thread and fiber are alive" do
+      fiber = mock()
+      fiber.expects(:alive?).returns(true)
+      thread = mock()
+      thread.expects(:alive?).returns(true)
+      Fiber.stubs(:current).returns(fiber)
+      Thread.stubs(:current).returns(thread)
+
+      @proxy.start
+      @proxy.sweep
+    end
+
+    it "should remove dead threads or fibers" do
+      fiber = mock()
+      fiber.stubs(:alive?).returns(false)
+      thread = mock()
+      thread.stubs(:alive?).returns(true)
+      Fiber.stubs(:current).returns(fiber)
+      Thread.stubs(:current).returns(thread)
+
+      @proxy.start
+      @proxy.sweep
+      assert !@proxy.started?
+
+      fiber.stubs(:alive?).returns(true)
+      thread.stubs(:alive?).returns(false)
+
+      @proxy.start
+      @proxy.sweep
+      assert !@proxy.started?
+    end
+  end
 end

data/test/buffered_logger/middleware_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe BufferedLogger::Middleware do
-  def setup
+  before do
     @app = mock()
     @app.stubs(:call).returns([200, {}, []])
     @logger = mock()

data/test/buffered_logger_test.rb

@@ -1,73 +1,18 @@
 require "test_helper"
 
-class MockLogDeviceProxy
-  def initialize
-    @started = false
-  end
-
-  def end
-    @started = false
-  end
-
-  def start
-    @started = true
-
-    if block_given?
-      begin
-        yield
-      ensure
-        @started = false
-      end
-    else
-      true
-    end
-  end
-
-  def started?
-    @started
-  end
-end
-
 describe BufferedLogger do
-  describe "with MockLogDeviceProxy" do
-    def setup
-      @logdev = MockLogDeviceProxy.new
-      @logger = BufferedLogger.allocate
-      @logger.instance_variable_set(:@logdev, @logdev)
-    end
-
-    it "should raise an error if end is called while not started" do
-      -> { @logger.end }.must_raise(BufferedLogger::NotStartedError)
-    end
-
-    it "should raise an error if start is called while already started" do
-      @logger.start
-      -> { @logger.start }.must_raise(BufferedLogger::AlreadyStartedError)
-    end
+  before do
+    @buffer = StringIO.new
+    @logger = BufferedLogger.new(@buffer)
   end
 
-  describe "with mock" do
-    def setup
-      @logdev = mock()
-      @logger = BufferedLogger.allocate
-      @logger.instance_variable_set(:@logdev, @logdev)
-    end
-
-    it "should call end on logdev" do
-      @logdev.expects(:end)
-      @logdev.stubs(:started?).returns(true)
-      @logger.end
-    end
-
-    it "should call start on logdev" do
-      @logdev.expects(:start)
-      @logdev.stubs(:started?).returns(false)
-      @logger.start
-    end
+  it "should raise an error if end is called while not started" do
+    @logger.stubs(:started?).returns(false)
+    -> { @logger.end }.must_raise(BufferedLogger::NotStartedError)
+  end
 
-    it "should call started? on logdev" do
-      @logdev.expects(:started?)
-      @logger.started?
-    end
+  it "should raise an error if start is called while already started" do
+    @logger.stubs(:started?).returns(true)
+    -> { @logger.start }.must_raise(BufferedLogger::AlreadyStartedError)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buffered-logger
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,15 +43,33 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.12.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 description: buffered-logger is designed to be used in multithreaded or multifiber
   rack servers and includes a middleware to automatically capture and write the buffered
-  log statements during each request.
+  log statements during each request. This is ideal for keeping requests together
+  for log parsing software such as splunk.
 email:
 - samuel@kadolph.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/buffered-logger.rb
 - lib/buffered_logger/errors.rb
 - lib/buffered_logger/log_device_proxy.rb
 - lib/buffered_logger/middleware.rb
@@ -61,7 +79,7 @@ files:
 - test/buffered_logger/log_device_proxy_test.rb
 - test/buffered_logger/middleware_test.rb
 - test/buffered_logger_test.rb
-homepage: http://samuelkadolph.github.com/buffered-logger
+homepage: http://samuelkadolph.github.com/buffered-logger/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -79,6 +97,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4164329227286823288
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -90,4 +111,3 @@ test_files:
 - test/buffered_logger/log_device_proxy_test.rb
 - test/buffered_logger/middleware_test.rb
 - test/buffered_logger_test.rb
-has_rdoc: