serverengine 1.5.10 → 1.5.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- OWNiN2U5ZGRhMjk1NGI1ZDAxNmY3OWE5OTZkMWI0ZDI5Nzg3NDQzYw==
5
- data.tar.gz: !binary |-
6
- MTFlMzk4MjE1ZDdhZDdiMWRkNzg2YmY3M2MxMWU5MjY5OWU3ZTFkNw==
2
+ SHA1:
3
+ metadata.gz: 9d0f894b59ef81b2998f4d6ab09a3c84f8c4e7c1
4
+ data.tar.gz: 56a730fe75ba58f16c783c61834342f6074e9cbc
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- NGI0NjQyMWMxNTJmMzBlYTFhM2YwM2U2OGUwMWM4OGMzMzI4ODA4YmQ4ZGI3
10
- ZjE5MTUzMzk2YTJkYWVjNTNkMzU0ZjkwZWU1ODY2M2VkNDUwZmM5ZjgxY2Qw
11
- NWUyYzhmOWIyYTA0ZGQ3ZGUwYWMwYTNjODZlNzAyM2IwNWFlNDI=
12
- data.tar.gz: !binary |-
13
- ZTRjMWQ0N2E4OTI5ZGUzOTZjYTU3ZTI5MzVmYzdiMjBjOGU5Yjg4NzBjOGE0
14
- OGEwYzM2MDNiMTc5ZmE1NDQ4MjkwNGVhZjFiZDIxMzEzMTBiNzRkOWU0ZTM0
15
- NmFkZWM1NTgyYjBmOGRhYzU1NmZjNzJiOGM5ZDYyNjBiYzQxNDI=
6
+ metadata.gz: cd028d040dd71a518538363ccaa641ce96e9a83a800067ae268e34a48aad7327dbc19301294b89d6d9d0e9fb17acf3b905aaa5d3c0c41c6d3d89a959accc3515
7
+ data.tar.gz: 44e2e9ee06c2168d7758507385f4e2ad04caf91248814f8297e05be53ac4c3c710a64390a83a89379422de33190435925f94aa7ac8fe355700107ba26fcac4a1
@@ -2,11 +2,12 @@ language: ruby
2
2
 
3
3
  rvm:
4
4
  - 1.9.3
5
- - 2.0.0
6
- - 2.1.2
5
+ - 2.0
6
+ - 2.1
7
+ - 2.2
7
8
 
8
9
  branches:
9
10
  only:
10
11
  - master
11
12
 
12
- script: bundle exec rake
13
+ script: bundle exec rake spec
data/Changelog CHANGED
@@ -1,3 +1,8 @@
1
+ 2015-09-28 version 1.5.11:
2
+
3
+ * Fix unexpected logger option handling [#22]
4
+ * Fix gem homepage link
5
+
1
6
 
2
7
  2014-10-27 version 1.5.10:
3
8
 
@@ -79,8 +79,8 @@ module ServerEngine
79
79
  create_logger unless @logger
80
80
 
81
81
  # start threads to transfer logs from STDOUT/ERR to the logger
82
- start_io_logging_thread(STDOUT) if @log_stdout
83
- start_io_logging_thread(STDERR) if @log_stderr
82
+ start_io_logging_thread(STDOUT) if @log_stdout && try_get_io_from_logger(@logger) != STDOUT
83
+ start_io_logging_thread(STDERR) if @log_stderr && try_get_io_from_logger(@logger) != STDERR
84
84
 
85
85
  before_run
86
86
 
@@ -98,6 +98,20 @@ module ServerEngine
98
98
 
99
99
  private
100
100
 
101
+ # If :logger option is set unexpectedly, reading from STDOUT/ERR
102
+ # and writing to :logger could cause infinite loop because
103
+ # :logger may write data to STDOUT/ERR.
104
+ def try_get_io_from_logger(logger)
105
+ logdev = logger.instance_eval { @logdev }
106
+ if logdev.respond_to?(:dev)
107
+ # ::Logger
108
+ logdev.dev
109
+ else
110
+ # logdev is IO if DaemonLogger. otherwise unknown object including nil
111
+ logdev
112
+ end
113
+ end
114
+
101
115
  def create_worker(wid)
102
116
  w = Worker.new(self, wid)
103
117
  w.extend(WorkerInitializer)
@@ -1,3 +1,3 @@
1
1
  module ServerEngine
2
- VERSION = "1.5.10"
2
+ VERSION = "1.5.11"
3
3
  end
@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
8
8
  gem.email = ["frsyuki@gmail.com"]
9
9
  gem.description = %q{A framework to implement robust multiprocess servers like Unicorn}
10
10
  gem.summary = %q{ServerEngine - multiprocess server framework}
11
- gem.homepage = "https://github.com/frsyuki/serverengine"
11
+ gem.homepage = "https://github.com/fluent/serverengine"
12
12
  gem.license = "Apache 2.0"
13
13
 
14
14
  gem.files = `git ls-files`.split($\)
metadata CHANGED
@@ -1,55 +1,55 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: serverengine
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.10
4
+ version: 1.5.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sadayuki Furuhashi
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-27 00:00:00.000000000 Z
11
+ date: 2015-09-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sigdump
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.2.2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.2.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ! '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.9.2
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ! '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.9.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: 2.13.0
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: 2.13.0
55
55
  description: A framework to implement robust multiprocess servers like Unicorn
@@ -59,9 +59,9 @@ executables: []
59
59
  extensions: []
60
60
  extra_rdoc_files: []
61
61
  files:
62
- - .gitignore
63
- - .rspec
64
- - .travis.yml
62
+ - ".gitignore"
63
+ - ".rspec"
64
+ - ".travis.yml"
65
65
  - Changelog
66
66
  - Gemfile
67
67
  - LICENSE
@@ -94,7 +94,7 @@ files:
94
94
  - spec/signal_thread_spec.rb
95
95
  - spec/spec_helper.rb
96
96
  - spec/supervisor_spec.rb
97
- homepage: https://github.com/frsyuki/serverengine
97
+ homepage: https://github.com/fluent/serverengine
98
98
  licenses:
99
99
  - Apache 2.0
100
100
  metadata: {}
@@ -104,17 +104,17 @@ require_paths:
104
104
  - lib
105
105
  required_ruby_version: !ruby/object:Gem::Requirement
106
106
  requirements:
107
- - - ! '>='
107
+ - - ">="
108
108
  - !ruby/object:Gem::Version
109
109
  version: 1.9.3
110
110
  required_rubygems_version: !ruby/object:Gem::Requirement
111
111
  requirements:
112
- - - ! '>='
112
+ - - ">="
113
113
  - !ruby/object:Gem::Version
114
114
  version: '0'
115
115
  requirements: []
116
116
  rubyforge_project:
117
- rubygems_version: 2.2.2
117
+ rubygems_version: 2.2.3
118
118
  signing_key:
119
119
  specification_version: 4
120
120
  summary: ServerEngine - multiprocess server framework