chrono_logger 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4685d19b4094e975b08164b4041c82d20a0d843
-  data.tar.gz: 87f197078fead7232cc75b576a5eee36def4b0dd
+  metadata.gz: 088ff7e10a40407ed7bb375eb699a92f50c5d1ec
+  data.tar.gz: 4c24284de175508bd2b3d2966701c211929fefb5
 SHA512:
-  metadata.gz: 6c453b8b694c821b515c7b40a4b8641e2fad33295676b11894aa6e6efedc995dffc1dd91ff83b5ee0a07e554a2b7fa943e1f173e0f0f540bcb334ec45535d57c
-  data.tar.gz: 53db7768b5ecfbafded33375ccf583faed190bf2997c78cb25ebb2e41e0db00189d1737c039b254ea762b678b9b7a7501d94b74122962065b8fcbe733af676f2
+  metadata.gz: 8b1840ba67d2002c388a1cf76d2a5b4c20d42fc2fb759f7b972bacd26b9fbba4e8008ea2bb83cee1d6939e5d704d2bbd37e2988b7b48cea43fce2e775bf6b137
+  data.tar.gz: b51831122c18dddd0eaa2c26ea1454568f3d5830c3add968dc359281c016f6b4963d9284bdacaa57dd1fb21fd786ebd74f35f25f58e761592701f3fbe6f04aaa

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
+  - 2.0.0-p598
   - 2.1.5
+  - 2.2.0
+sudo: false
+cache: bundler

data/README.md

@@ -1,5 +1,11 @@
 # ChronoLogger
 
+[![Gem Version](https://badge.fury.io/rb/chrono_logger.svg)](http://badge.fury.io/rb/chrono_logger)
+[![Build Status](https://travis-ci.org/ma2gedev/chrono_logger.svg)](https://travis-ci.org/ma2gedev/chrono_logger)
+[![Code Climate](https://codeclimate.com/github/ma2gedev/chrono_logger/badges/gpa.svg)](https://codeclimate.com/github/ma2gedev/chrono_logger)
+[![Coverage Status](https://coveralls.io/repos/ma2gedev/chrono_logger/badge.svg)](https://coveralls.io/r/ma2gedev/chrono_logger)
+[![endorse](https://api.coderwall.com/ma2gedev/endorsecount.png)](https://coderwall.com/ma2gedev)
+
 A lock-free logger with timebased file rotation.
 
 ## Installation

data/chrono_logger.gemspec

@@ -24,4 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "delorean"
   spec.add_development_dependency "parallel"
+  spec.add_development_dependency "coveralls"
+
+  # for performance check
+  spec.add_development_dependency "mono_logger"
+  spec.add_development_dependency "log4r"
 end

data/lib/chrono_logger.rb

@@ -13,7 +13,31 @@ class ChronoLogger < Logger
     end
   end
 
+  module Period
+    DAILY = 1
+
+    SiD = 24 * 60 * 60
+
+    def determine_period(format)
+      case format
+      when /%d/ then DAILY
+      else nil
+      end
+    end
+
+    def next_start_period(now, period)
+      case period
+      when DAILY
+        Time.mktime(now.year, now.month, now.mday) + SiD
+      else
+        nil
+      end
+    end
+  end
+
   class TimeBasedLogDevice < LogDevice
+    include Period
+
     DELAY_SECOND_TO_CLOSE_FILE = 5
 
     def initialize(log = nil, opt = {})
@@ -23,25 +47,20 @@ class ChronoLogger < Logger
         @dev = log
       else
         @pattern = log
-        @filename = Time.now.strftime(@pattern)
+        @period = determine_period(@pattern)
+        now = Time.now
+        @filename = now.strftime(@pattern)
+        @next_start_period = next_start_period(now, @period)
         @dev = open_logfile(@filename)
         @dev.sync = true
       end
     end
 
     def write(message)
-      if @pattern && @dev.respond_to?(:stat)
-        begin
-          check_shift_log
-        rescue
-          warn("log shifting failed. #{$!}")
-        end
-      end
-      begin
-        @dev.write(message)
-      rescue
-        warn("log writing failed. #{$!}")
-      end
+      check_shift_log if @pattern
+      @dev.write(message)
+    rescue
+      warn("log writing failed. #{$!}")
     end
 
     def close
@@ -71,10 +90,21 @@ class ChronoLogger < Logger
     end
 
     def check_shift_log
-      unless Time.now.strftime(@pattern) == @filename
-        new_filename = Time.now.strftime(@pattern)
+      if next_period?(Time.now)
+        now = Time.now
+        new_filename = now.strftime(@pattern)
+        next_start_period = next_start_period(now, @period)
         shift_log_period(new_filename)
         @filename = new_filename
+        @next_start_period = next_start_period
+      end
+    end
+
+    def next_period?(now)
+      if @period
+        @next_start_period <= now
+      else
+        Time.now.strftime(@pattern) != @filename
       end
     end
 

data/lib/chrono_logger/version.rb

@@ -1,5 +1,5 @@
 require 'logger'
 
 class ChronoLogger < Logger
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/from_ruby_repo/test_logdevice.rb

@@ -98,30 +98,6 @@ class TestLogDevice < Test::Unit::TestCase
     r.close
   end
 
-  def test_shifting_age_in_multiprocess
-    old_log = [@tempfile.path, '20150122'].join
-    new_log = [@tempfile.path, '20150123'].join
-    $stderr, stderr = StringIO.new, $stderr
-    begin
-      Delorean.time_travel_to '2015-01-22 23:59:59'
-      logger = ChronoLogger.new(@format)
-      Parallel.map(['a', 'b'], :in_processes => 2) do |letter|
-        5000.times do
-          logger.info letter * 5000
-        end
-      end
-      assert_no_match(/log shifting failed/, $stderr.string)
-      assert_no_match(/log writing failed/, $stderr.string)
-      assert { File.exist?(old_log) }
-      assert { File.exist?(new_log) }
-    ensure
-      $stderr, stderr = stderr, $stderr
-      Delorean.back_to_the_present
-      File.unlink(old_log)
-      File.unlink(new_log)
-    end
-  end
-
   def test_shifting_midnight
     Dir.mktmpdir do |tmpdir|
       log = "log20140102"

data/test/from_ruby_repo/test_logger.rb

@@ -26,12 +26,13 @@ class TestLogger < Test::Unit::TestCase
   end
 
   def log_raw(logger, msg_id, *arg, &block)
-    Tempfile.create(File.basename(__FILE__) + '.log') {|logdev|
-      logger.instance_eval { @logdev = ChronoLogger::TimeBasedLogDevice.new(logdev) }
-      logger.__send__(msg_id, *arg, &block)
-      logdev.rewind
-      logdev.read
-    }
+    logdev = Tempfile.new(File.basename(__FILE__) + '.log')
+    logger.instance_eval { @logdev = ChronoLogger::TimeBasedLogDevice.new(logdev) }
+    logger.__send__(msg_id, *arg, &block)
+    logdev.open
+    msg = logdev.read
+    logdev.close(true)
+    msg
   end
 
   def test_level

data/test/helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'chrono_logger'
 

data/test/test_chrono_logger.rb

@@ -1,7 +1,66 @@
 require 'helper'
+require 'tempfile'
+require 'parallel'
+require 'delorean'
 
 class TestChronoLogger < Test::Unit::TestCase
+  def setup
+    @tempfile = Tempfile.new("logger")
+    @tempfile.close
+    @format = [@tempfile.path, '%Y%m%d'].join
+    @filename = Time.now.strftime(@format)
+    File.unlink(@tempfile.path)
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
   def test_that_it_has_a_version_number
     refute_nil ::ChronoLogger::VERSION
   end
+
+  def test_shifting_age_in_multithreads
+    confirm_daily_rotation(in_threads: 2)
+  end
+
+  def test_shifting_age_in_multiprocess
+    confirm_daily_rotation(in_processes: 2)
+  end
+
+private
+
+  def confirm_daily_rotation(option)
+    old_log = [@tempfile.path, '20150122'].join
+    new_log = [@tempfile.path, '20150123'].join
+    $stderr, stderr = StringIO.new, $stderr
+    begin
+      Delorean.time_travel_to '2015-01-22 23:59:59.990'
+      logger = ChronoLogger.new(@format)
+      old_logdev = logger.instance_variable_get('@logdev').dev
+      Parallel.map(['a', 'b'], option) do |letter|
+        5000.times do
+          logger.info letter * 5000
+        end
+      end
+      assert_no_match(/log shifting failed/, $stderr.string)
+      assert_no_match(/log writing failed/, $stderr.string)
+      assert { !old_logdev.closed? }
+      assert { File.exist?(old_log) }
+      assert { File.exist?(new_log) }
+      assert { File.read(old_log).count("\n") + File.read(new_log).count("\n") == 10000 }
+
+      sleep ChronoLogger::TimeBasedLogDevice::DELAY_SECOND_TO_CLOSE_FILE + 1
+      old_logdev.close if option[:in_processes]
+      assert { old_logdev.closed? } # TODO: check in multiprocess
+      assert { File.exist?(old_log) }
+      assert { File.exist?(new_log) }
+      assert { File.read(old_log).count("\n") + File.read(new_log).count("\n") == 10000 }
+    ensure
+      $stderr, stderr = stderr, $stderr
+      Delorean.back_to_the_present
+      File.unlink(old_log)
+      File.unlink(new_log)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chrono_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Takayuki Matsubara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mono_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A lock-free logger with timebased file rotation.
 email:
 - takayuki.1229@gmail.com