serverengine 1.5.10 → 1.5.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWNiN2U5ZGRhMjk1NGI1ZDAxNmY3OWE5OTZkMWI0ZDI5Nzg3NDQzYw==
-  data.tar.gz: !binary |-
-    MTFlMzk4MjE1ZDdhZDdiMWRkNzg2YmY3M2MxMWU5MjY5OWU3ZTFkNw==
+SHA1:
+  metadata.gz: 9d0f894b59ef81b2998f4d6ab09a3c84f8c4e7c1
+  data.tar.gz: 56a730fe75ba58f16c783c61834342f6074e9cbc
 SHA512:
-  metadata.gz: !binary |-
-    NGI0NjQyMWMxNTJmMzBlYTFhM2YwM2U2OGUwMWM4OGMzMzI4ODA4YmQ4ZGI3
-    ZjE5MTUzMzk2YTJkYWVjNTNkMzU0ZjkwZWU1ODY2M2VkNDUwZmM5ZjgxY2Qw
-    NWUyYzhmOWIyYTA0ZGQ3ZGUwYWMwYTNjODZlNzAyM2IwNWFlNDI=
-  data.tar.gz: !binary |-
-    ZTRjMWQ0N2E4OTI5ZGUzOTZjYTU3ZTI5MzVmYzdiMjBjOGU5Yjg4NzBjOGE0
-    OGEwYzM2MDNiMTc5ZmE1NDQ4MjkwNGVhZjFiZDIxMzEzMTBiNzRkOWU0ZTM0
-    NmFkZWM1NTgyYjBmOGRhYzU1NmZjNzJiOGM5ZDYyNjBiYzQxNDI=
+  metadata.gz: cd028d040dd71a518538363ccaa641ce96e9a83a800067ae268e34a48aad7327dbc19301294b89d6d9d0e9fb17acf3b905aaa5d3c0c41c6d3d89a959accc3515
+  data.tar.gz: 44e2e9ee06c2168d7758507385f4e2ad04caf91248814f8297e05be53ac4c3c710a64390a83a89379422de33190435925f94aa7ac8fe355700107ba26fcac4a1

data/.travis.yml

@@ -2,11 +2,12 @@ language: ruby
 
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
 
 branches:
   only:
     - master
 
-script: bundle exec rake
+script: bundle exec rake spec

data/Changelog

@@ -1,3 +1,8 @@
+2015-09-28 version 1.5.11:
+
+* Fix unexpected logger option handling [#22]
+* Fix gem homepage link
+
 
 2014-10-27 version 1.5.10:
 

data/lib/serverengine/server.rb

@@ -79,8 +79,8 @@ module ServerEngine
       create_logger unless @logger
 
       # start threads to transfer logs from STDOUT/ERR to the logger
-      start_io_logging_thread(STDOUT) if @log_stdout
-      start_io_logging_thread(STDERR) if @log_stderr
+      start_io_logging_thread(STDOUT) if @log_stdout && try_get_io_from_logger(@logger) != STDOUT
+      start_io_logging_thread(STDERR) if @log_stderr && try_get_io_from_logger(@logger) != STDERR
 
       before_run
 
@@ -98,6 +98,20 @@ module ServerEngine
 
     private
 
+    # If :logger option is set unexpectedly, reading from STDOUT/ERR
+    # and writing to :logger could cause infinite loop because
+    # :logger may write data to STDOUT/ERR.
+    def try_get_io_from_logger(logger)
+      logdev = logger.instance_eval { @logdev }
+      if logdev.respond_to?(:dev)
+        # ::Logger
+        logdev.dev
+      else
+        # logdev is IO if DaemonLogger. otherwise unknown object including nil
+        logdev
+      end
+    end
+
     def create_worker(wid)
       w = Worker.new(self, wid)
       w.extend(WorkerInitializer)

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.5.10"
+  VERSION = "1.5.11"
 end

data/serverengine.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["frsyuki@gmail.com"]
   gem.description   = %q{A framework to implement robust multiprocess servers like Unicorn}
   gem.summary       = %q{ServerEngine - multiprocess server framework}
-  gem.homepage      = "https://github.com/frsyuki/serverengine"
+  gem.homepage      = "https://github.com/fluent/serverengine"
   gem.license       = "Apache 2.0"
 
   gem.files         = `git ls-files`.split($\)

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
 description: A framework to implement robust multiprocess servers like Unicorn
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Changelog
 - Gemfile
 - LICENSE
@@ -94,7 +94,7 @@ files:
 - spec/signal_thread_spec.rb
 - spec/spec_helper.rb
 - spec/supervisor_spec.rb
-homepage: https://github.com/frsyuki/serverengine
+homepage: https://github.com/fluent/serverengine
 licenses:
 - Apache 2.0
 metadata: {}
@@ -104,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: ServerEngine - multiprocess server framework