serverengine 1.5.7 → 1.5.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWJjNGIwYzAzZWFiOWYzNjMzODhiZGMyOTI0YzgwMzQ0MjRlMWFjMA==
+  data.tar.gz: !binary |-
+    YTI2MGEzN2E3Yjc5NzUxZTY2YjYwMWZkYmIyN2VkOTM5OTA4MGQ0MA==
+SHA512:
+  metadata.gz: !binary |-
+    OTI3ZDNiN2I2MGQxYTBmZWQwZWU2ZGFmNDRkYTE5MGZjMWY1YzZkMDJlYTM5
+    M2JiZTBhZWI1MGQwMTlhNGM2MzQwMjNkODEyYmY3ODk3ZTIxNTY3NWQxZGQ5
+    MGQzNTIxYjA4NGZhYTI1Y2Y4OWI4MzhkNWY2ZjY1NTg2NGMwNWE=
+  data.tar.gz: !binary |-
+    MzkxNmJiZTU1ZmRlNzgyYzZhMmRmOGVmOTI0MWI2NDU4MjlkMjE1OWIxM2M5
+    MGYyMjNmYmZhOGJlNDcwNmI1NDZiNTQ1MzcyYTljMGZhMzVkMzkxYWU0ZjYz
+    MTU4YTAyYTdlMjYwM2QwMTE0OTIxMTMyNmQ3Mzg1MjU3MTE1ODY=

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
 
 branches:
   only:

data/Changelog

@@ -1,4 +1,9 @@
 
+2014-06-27 version 1.5.8:
+
+* Use standard LogDevice on Ruby >= 2.1.0 imporoved at https://github.com/ruby/ruby/pull/428
+
+
 2013-10-31 version 1.5.7:
 
 * Fixed :log parameter handling

data/lib/serverengine/daemon_logger.rb

@@ -21,11 +21,16 @@ module ServerEngine
 
   class DaemonLogger < Logger
     def initialize(logdev, config={})
-      rotate_age = config[:log_rotate_age] || 5
-      rotate_size = config[:log_rotate_size] || 1048576
+      @rotate_age = config[:log_rotate_age] || 5
+      @rotate_size = config[:log_rotate_size] || 1048576
 
-      @file_dev = MultiprocessFileLogDevice.new(nil,
-        shift_age: rotate_age, shift_size: rotate_size)
+      if RUBY_VERSION < "2.1.0"
+        # Ruby < 2.1.0 has a problem around log rotation with multiprocess:
+        # https://github.com/ruby/ruby/pull/428
+        @logdev_class = MultiprocessFileLogDevice
+      else
+        @logdev_class = LogDevice
+      end
 
       super(nil)
 
@@ -39,10 +44,16 @@ module ServerEngine
         # IO
         @logdev = logdev
         @logdev.sync = true if @logdev.respond_to?(:sync=)
-        @file_dev.path = nil
-      else
-        # path string
-        @file_dev.path = logdev
+        if @file_dev
+          old_file_dev = @file_dev
+          @file_dev = nil
+          old_file_dev.close
+        end
+      elsif !@file_dev || @file_dev.filename != logdev
+        # update path string
+        old_file_dev = @file_dev
+        @file_dev = @logdev_class.new(logdev, shift_age: @rotate_age, shift_size: @rotate_size)
+        old_file_dev.close if old_file_dev
         @logdev = @file_dev
       end
       logdev
@@ -98,7 +109,7 @@ module ServerEngine
     def trace?; @level <= TRACE; end
 
     def reopen!
-      @file_dev.reopen!
+      @file_dev.reopen! if @file_dev
       nil
     end
 
@@ -113,7 +124,7 @@ module ServerEngine
     end
 
     def close
-      @file_dev.close
+      @file_dev.close if @file_dev
       nil
     end
 
@@ -162,8 +173,6 @@ module ServerEngine
         nil
       end
 
-      attr_reader :path
-
       def reopen!
         @mutex.synchronize do
           if @file
@@ -210,13 +219,14 @@ module ServerEngine
           begin
             lock.flock(File::LOCK_EX)
             ino = lock.stat.ino
-            if ino == File.stat(@path).ino
+            if ino == File.stat(@path).ino and ino == stat.ino
               # 3)
               log_rotate
             else
-              reopen!
+              @file.reopen(@path, 'a')
+              @file.sync = true
             end
-          rescue
+          ensure
             lock.close
           end
         rescue Errno::ENOENT => e

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.5.7"
+  VERSION = "1.5.8"
 end

data/spec/daemon_logger_spec.rb

@@ -109,23 +109,25 @@ describe ServerEngine::DaemonLogger do
   end
 
   it 'rotation' do
-    log = DaemonLogger.new("tmp/se1.log", level: 'trace', log_rotate_age: 3, log_rotate_size: 10)
-    log.warn "test1"
+    log = DaemonLogger.new("tmp/se1.log", level: 'trace', log_rotate_age: 3, log_rotate_size: 10000)
+    # 100 bytes
+    log.warn "test1"*20
     File.exist?("tmp/se1.log").should == true
     File.exist?("tmp/se1.log.0").should == false
 
-    log.warn "test2"
+    # 10000 bytes
+    100.times { log.warn "test2"*20 }
     File.exist?("tmp/se1.log").should == true
     File.exist?("tmp/se1.log.0").should == true
     File.read("tmp/se1.log.0") =~ /test2$/
 
-    log.warn "test3"
-    log.warn "test4"
+    # 10000 bytes
+    100.times { log.warn "test3"*20 }
     File.exist?("tmp/se1.log").should == true
-    File.exist?("tmp/se1.log.2").should == true
-    File.exist?("tmp/se1.log.3").should == false
+    File.exist?("tmp/se1.log.1").should == true
+    File.exist?("tmp/se1.log.2").should == false
 
-    log.warn "test5"
+    log.warn "test4"*20
     File.read("tmp/se1.log.0") =~ /test5$/
   end
 
@@ -138,4 +140,27 @@ describe ServerEngine::DaemonLogger do
     log.debug "stdout logging test"
     log.reopen!
   end
+
+  it 'inter-process locking on rotation' do
+    log = DaemonLogger.new("tmp/se1.log", level: 'trace', log_rotate_age: 3, log_rotate_size: 10)
+    r, w = IO.pipe
+    $stderr = w # To capture #warn output in DaemonLogger
+    pid1 = Process.fork do
+      10.times do
+        log.info '0' * 15
+      end
+    end
+    pid2 = Process.fork do
+      10.times do
+        log.info '0' * 15
+      end
+    end
+    Process.waitpid pid1
+    Process.waitpid pid2
+    w.close
+    stderr = r.read
+    r.close
+    $stderr = STDERR
+    stderr.should_not =~ /(log shifting failed|log writing failed|log rotation inter-process lock failed)/
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.5.7
-  prerelease: 
+  version: 1.5.8
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,30 +96,26 @@ files:
 homepage: https://github.com/frsyuki/serverengine
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1992105160493860645
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ServerEngine - multiprocess server framework
 test_files:
 - spec/blocking_flag_spec.rb