serverengine 1.5.2 → 1.5.3
Sign up to get free protection for your applications and to get access to all the features.
- data/Changelog +9 -0
- data/LICENSE +202 -0
- data/NOTICE +3 -0
- data/README.md +10 -7
- data/lib/serverengine.rb +1 -1
- data/lib/serverengine/blocking_flag.rb +1 -1
- data/lib/serverengine/config_loader.rb +1 -1
- data/lib/serverengine/daemon.rb +6 -7
- data/lib/serverengine/daemon_logger.rb +2 -2
- data/lib/serverengine/embedded_server.rb +1 -1
- data/lib/serverengine/multi_process_server.rb +6 -5
- data/lib/serverengine/multi_thread_server.rb +5 -4
- data/lib/serverengine/multi_worker_server.rb +7 -1
- data/lib/serverengine/process_manager.rb +1 -1
- data/lib/serverengine/server.rb +1 -1
- data/lib/serverengine/signal_thread.rb +1 -1
- data/lib/serverengine/supervisor.rb +1 -1
- data/lib/serverengine/utils.rb +1 -1
- data/lib/serverengine/version.rb +1 -1
- data/lib/serverengine/worker.rb +1 -1
- data/serverengine.gemspec +1 -0
- metadata +7 -7
- data/COPYING +0 -14
data/Changelog
CHANGED
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
|
|
2
|
+
2013-06-30 version 1.5.3:
|
|
3
|
+
|
|
4
|
+
* Daemon: uses Process::UID.from_name and Process::GID.from_name
|
|
5
|
+
instead of running id command
|
|
6
|
+
* worker_type=thread calls before_fork
|
|
7
|
+
* Added MultiWorkerServer#join_workers
|
|
8
|
+
* DaemonLogger: fixed #initialize to use config[:log_level]
|
|
9
|
+
|
|
10
|
+
|
|
2
11
|
2013-06-11 version 1.5.2:
|
|
3
12
|
|
|
4
13
|
* Updated default parameters of ProcessManager to be more conservative
|
data/LICENSE
ADDED
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
|
|
2
|
+
Apache License
|
|
3
|
+
Version 2.0, January 2004
|
|
4
|
+
http://www.apache.org/licenses/
|
|
5
|
+
|
|
6
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
7
|
+
|
|
8
|
+
1. Definitions.
|
|
9
|
+
|
|
10
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
11
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
12
|
+
|
|
13
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
14
|
+
the copyright owner that is granting the License.
|
|
15
|
+
|
|
16
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
17
|
+
other entities that control, are controlled by, or are under common
|
|
18
|
+
control with that entity. For the purposes of this definition,
|
|
19
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
20
|
+
direction or management of such entity, whether by contract or
|
|
21
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
22
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
23
|
+
|
|
24
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
25
|
+
exercising permissions granted by this License.
|
|
26
|
+
|
|
27
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
28
|
+
including but not limited to software source code, documentation
|
|
29
|
+
source, and configuration files.
|
|
30
|
+
|
|
31
|
+
"Object" form shall mean any form resulting from mechanical
|
|
32
|
+
transformation or translation of a Source form, including but
|
|
33
|
+
not limited to compiled object code, generated documentation,
|
|
34
|
+
and conversions to other media types.
|
|
35
|
+
|
|
36
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
37
|
+
Object form, made available under the License, as indicated by a
|
|
38
|
+
copyright notice that is included in or attached to the work
|
|
39
|
+
(an example is provided in the Appendix below).
|
|
40
|
+
|
|
41
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
42
|
+
form, that is based on (or derived from) the Work and for which the
|
|
43
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
44
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
45
|
+
of this License, Derivative Works shall not include works that remain
|
|
46
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
47
|
+
the Work and Derivative Works thereof.
|
|
48
|
+
|
|
49
|
+
"Contribution" shall mean any work of authorship, including
|
|
50
|
+
the original version of the Work and any modifications or additions
|
|
51
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
52
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
53
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
54
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
55
|
+
means any form of electronic, verbal, or written communication sent
|
|
56
|
+
to the Licensor or its representatives, including but not limited to
|
|
57
|
+
communication on electronic mailing lists, source code control systems,
|
|
58
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
59
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
60
|
+
excluding communication that is conspicuously marked or otherwise
|
|
61
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
62
|
+
|
|
63
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
64
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
65
|
+
subsequently incorporated within the Work.
|
|
66
|
+
|
|
67
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
68
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
69
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
70
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
71
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
72
|
+
Work and such Derivative Works in Source or Object form.
|
|
73
|
+
|
|
74
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
75
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
76
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
77
|
+
(except as stated in this section) patent license to make, have made,
|
|
78
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
79
|
+
where such license applies only to those patent claims licensable
|
|
80
|
+
by such Contributor that are necessarily infringed by their
|
|
81
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
82
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
83
|
+
institute patent litigation against any entity (including a
|
|
84
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
85
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
86
|
+
or contributory patent infringement, then any patent licenses
|
|
87
|
+
granted to You under this License for that Work shall terminate
|
|
88
|
+
as of the date such litigation is filed.
|
|
89
|
+
|
|
90
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
91
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
92
|
+
modifications, and in Source or Object form, provided that You
|
|
93
|
+
meet the following conditions:
|
|
94
|
+
|
|
95
|
+
(a) You must give any other recipients of the Work or
|
|
96
|
+
Derivative Works a copy of this License; and
|
|
97
|
+
|
|
98
|
+
(b) You must cause any modified files to carry prominent notices
|
|
99
|
+
stating that You changed the files; and
|
|
100
|
+
|
|
101
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
102
|
+
that You distribute, all copyright, patent, trademark, and
|
|
103
|
+
attribution notices from the Source form of the Work,
|
|
104
|
+
excluding those notices that do not pertain to any part of
|
|
105
|
+
the Derivative Works; and
|
|
106
|
+
|
|
107
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
108
|
+
distribution, then any Derivative Works that You distribute must
|
|
109
|
+
include a readable copy of the attribution notices contained
|
|
110
|
+
within such NOTICE file, excluding those notices that do not
|
|
111
|
+
pertain to any part of the Derivative Works, in at least one
|
|
112
|
+
of the following places: within a NOTICE text file distributed
|
|
113
|
+
as part of the Derivative Works; within the Source form or
|
|
114
|
+
documentation, if provided along with the Derivative Works; or,
|
|
115
|
+
within a display generated by the Derivative Works, if and
|
|
116
|
+
wherever such third-party notices normally appear. The contents
|
|
117
|
+
of the NOTICE file are for informational purposes only and
|
|
118
|
+
do not modify the License. You may add Your own attribution
|
|
119
|
+
notices within Derivative Works that You distribute, alongside
|
|
120
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
121
|
+
that such additional attribution notices cannot be construed
|
|
122
|
+
as modifying the License.
|
|
123
|
+
|
|
124
|
+
You may add Your own copyright statement to Your modifications and
|
|
125
|
+
may provide additional or different license terms and conditions
|
|
126
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
127
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
128
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
129
|
+
the conditions stated in this License.
|
|
130
|
+
|
|
131
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
132
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
133
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
134
|
+
this License, without any additional terms or conditions.
|
|
135
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
136
|
+
the terms of any separate license agreement you may have executed
|
|
137
|
+
with Licensor regarding such Contributions.
|
|
138
|
+
|
|
139
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
140
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
141
|
+
except as required for reasonable and customary use in describing the
|
|
142
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
143
|
+
|
|
144
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
145
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
146
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
147
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
148
|
+
implied, including, without limitation, any warranties or conditions
|
|
149
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
150
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
151
|
+
appropriateness of using or redistributing the Work and assume any
|
|
152
|
+
risks associated with Your exercise of permissions under this License.
|
|
153
|
+
|
|
154
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
155
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
156
|
+
unless required by applicable law (such as deliberate and grossly
|
|
157
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
158
|
+
liable to You for damages, including any direct, indirect, special,
|
|
159
|
+
incidental, or consequential damages of any character arising as a
|
|
160
|
+
result of this License or out of the use or inability to use the
|
|
161
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
162
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
163
|
+
other commercial damages or losses), even if such Contributor
|
|
164
|
+
has been advised of the possibility of such damages.
|
|
165
|
+
|
|
166
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
167
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
168
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
169
|
+
or other liability obligations and/or rights consistent with this
|
|
170
|
+
License. However, in accepting such obligations, You may act only
|
|
171
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
172
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
173
|
+
defend, and hold each Contributor harmless for any liability
|
|
174
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
175
|
+
of your accepting any such warranty or additional liability.
|
|
176
|
+
|
|
177
|
+
END OF TERMS AND CONDITIONS
|
|
178
|
+
|
|
179
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
180
|
+
|
|
181
|
+
To apply the Apache License to your work, attach the following
|
|
182
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
183
|
+
replaced with your own identifying information. (Don't include
|
|
184
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
185
|
+
comment syntax for the file format. We also recommend that a
|
|
186
|
+
file or class name and description of purpose be included on the
|
|
187
|
+
same "printed page" as the copyright notice for easier
|
|
188
|
+
identification within third-party archives.
|
|
189
|
+
|
|
190
|
+
Copyright [yyyy] [name of copyright owner]
|
|
191
|
+
|
|
192
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
193
|
+
you may not use this file except in compliance with the License.
|
|
194
|
+
You may obtain a copy of the License at
|
|
195
|
+
|
|
196
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
197
|
+
|
|
198
|
+
Unless required by applicable law or agreed to in writing, software
|
|
199
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
200
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
201
|
+
See the License for the specific language governing permissions and
|
|
202
|
+
limitations under the License.
|
data/NOTICE
ADDED
data/README.md
CHANGED
|
@@ -39,7 +39,7 @@ require 'serverengine'
|
|
|
39
39
|
module MyWorker
|
|
40
40
|
def run
|
|
41
41
|
until @stop
|
|
42
|
-
|
|
42
|
+
logger.info "Awesome work!"
|
|
43
43
|
sleep 1
|
|
44
44
|
end
|
|
45
45
|
end
|
|
@@ -51,7 +51,8 @@ end
|
|
|
51
51
|
|
|
52
52
|
se = ServerEngine.create(nil, MyWorker, {
|
|
53
53
|
:daemonize => true,
|
|
54
|
-
:
|
|
54
|
+
:log => 'myserver.log',
|
|
55
|
+
:pid_path => 'myserver.pid',
|
|
55
56
|
})
|
|
56
57
|
se.run
|
|
57
58
|
```
|
|
@@ -66,6 +67,7 @@ Simply set **process** or **thread** to `worker_type` parameter and number of wo
|
|
|
66
67
|
```ruby
|
|
67
68
|
se = ServerEngine.create(nil, MyWorker, {
|
|
68
69
|
:daemonize => true,
|
|
70
|
+
:log => 'myserver.log',
|
|
69
71
|
:pid_path => 'myserver.pid',
|
|
70
72
|
:workers => 4,
|
|
71
73
|
:worker_type => 'process',
|
|
@@ -107,6 +109,7 @@ end
|
|
|
107
109
|
|
|
108
110
|
se = ServerEngine.create(MyServer, MyWorker, {
|
|
109
111
|
:daemonize => true,
|
|
112
|
+
:log => 'myserver.log',
|
|
110
113
|
:pid_path => 'myserver.pid',
|
|
111
114
|
:workers => 4,
|
|
112
115
|
:worker_type => 'process',
|
|
@@ -204,7 +207,7 @@ module MyWorker
|
|
|
204
207
|
|
|
205
208
|
def run
|
|
206
209
|
until @stop
|
|
207
|
-
|
|
210
|
+
logger.info @message
|
|
208
211
|
sleep @sleep
|
|
209
212
|
end
|
|
210
213
|
end
|
|
@@ -240,7 +243,7 @@ module MyWorker
|
|
|
240
243
|
|
|
241
244
|
def run
|
|
242
245
|
until @stop_flag.wait_for_set(1.0) # or @stop_flag.set?
|
|
243
|
-
|
|
246
|
+
logger.info @message
|
|
244
247
|
end
|
|
245
248
|
end
|
|
246
249
|
|
|
@@ -265,7 +268,7 @@ se.run
|
|
|
265
268
|
|
|
266
269
|
- interface
|
|
267
270
|
- `initialize` is called in the parent process (or thread) in contrast to the other methods
|
|
268
|
-
- `before_fork` is called before fork for each worker process (available only if `worker_type` is "process")
|
|
271
|
+
- `before_fork` is called before fork for each worker process (available only if `worker_type` is "process" or "thread")
|
|
269
272
|
- `run` is the required method
|
|
270
273
|
- `stop` is called when TERM signal is received
|
|
271
274
|
- `reload` is called when USR2 signal is received
|
|
@@ -355,14 +358,14 @@ Graceful shutdown and restart call `Worker#stop` method and wait for completion
|
|
|
355
358
|
- **log_rotate_age** generations to keep rotated log files (default: 5) (not dynamic reloadable)
|
|
356
359
|
- **log_rotate_size** sets the size to rotate log files (default: 1048576) (not dynamic reloadable)
|
|
357
360
|
- **log_stdout** hooks STDOUT to log file (default: true) (not dynamic reloadable)
|
|
358
|
-
- **
|
|
361
|
+
- **log_stderr** hooks STDERR to log file (default: true) (not dynamic reloadable)
|
|
359
362
|
- **logger_class** class of the logger instance (default: ServerEngine::DaemonLogger)
|
|
360
363
|
|
|
361
364
|
---
|
|
362
365
|
|
|
363
366
|
```
|
|
364
367
|
Author: Sadayuki Furuhashi
|
|
365
|
-
Copyright: Copyright (c) 2012-2013
|
|
368
|
+
Copyright: Copyright (c) 2012-2013 Sadayuki Furuhashi
|
|
366
369
|
License: Apache License, Version 2.0
|
|
367
370
|
```
|
|
368
371
|
|
data/lib/serverengine.rb
CHANGED
data/lib/serverengine/daemon.rb
CHANGED
|
@@ -63,8 +63,7 @@ module ServerEngine
|
|
|
63
63
|
if group
|
|
64
64
|
chgid = group.to_i
|
|
65
65
|
if chgid.to_s != group
|
|
66
|
-
chgid =
|
|
67
|
-
exit! @daemonize_error_exit_code unless $?.success?
|
|
66
|
+
chgid = Process::GID.from_name(group)
|
|
68
67
|
end
|
|
69
68
|
Process::GID.change_privilege(chgid)
|
|
70
69
|
end
|
|
@@ -72,14 +71,14 @@ module ServerEngine
|
|
|
72
71
|
if user
|
|
73
72
|
chuid = user.to_i
|
|
74
73
|
if chuid.to_s != user
|
|
75
|
-
chuid =
|
|
76
|
-
exit! @daemonize_error_exit_code unless $?.success?
|
|
74
|
+
chuid = Process::UID.from_name(user)
|
|
77
75
|
end
|
|
78
76
|
|
|
79
77
|
user_groups = `id -G #{Shellwords.escape user}`.split.map(&:to_i)
|
|
80
|
-
|
|
78
|
+
if $?.success?
|
|
79
|
+
Process.groups = Process.groups | user_groups
|
|
80
|
+
end
|
|
81
81
|
|
|
82
|
-
Process.groups = Process.groups | user_groups
|
|
83
82
|
Process::UID.change_privilege(chuid)
|
|
84
83
|
end
|
|
85
84
|
|
|
@@ -115,7 +114,7 @@ module ServerEngine
|
|
|
115
114
|
$0 = @daemon_process_name if @daemon_process_name
|
|
116
115
|
wpipe.write "#{Process.pid}\n"
|
|
117
116
|
|
|
118
|
-
Daemon.change_privilege(@
|
|
117
|
+
Daemon.change_privilege(@chuser, @chgroup)
|
|
119
118
|
File.umask(@chumask) if @chumask
|
|
120
119
|
|
|
121
120
|
s = create_server(create_logger)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#
|
|
2
2
|
# ServerEngine
|
|
3
3
|
#
|
|
4
|
-
# Copyright (C) 2012
|
|
4
|
+
# Copyright (C) 2012-2013 Sadayuki Furuhashi
|
|
5
5
|
#
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
|
@@ -39,7 +39,7 @@ module ServerEngine
|
|
|
39
39
|
|
|
40
40
|
super(@io, rotate_age, rotate_size)
|
|
41
41
|
|
|
42
|
-
self.level = config[:
|
|
42
|
+
self.level = config[:log_level] || 'debug'
|
|
43
43
|
end
|
|
44
44
|
|
|
45
45
|
attr_accessor :path
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#
|
|
2
2
|
# ServerEngine
|
|
3
3
|
#
|
|
4
|
-
# Copyright (C) 2012-2013
|
|
4
|
+
# Copyright (C) 2012-2013 Sadayuki Furuhashi
|
|
5
5
|
#
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
|
@@ -22,6 +22,7 @@ module ServerEngine
|
|
|
22
22
|
@pm = ProcessManager.new(
|
|
23
23
|
auto_tick: false,
|
|
24
24
|
graceful_kill_signal: Daemon::Signals::GRACEFUL_STOP,
|
|
25
|
+
immediate_kill_signal: Daemon::Signals::IMMEDIATE_STOP,
|
|
25
26
|
auto_heartbeat: true,
|
|
26
27
|
on_heartbeat_error: Proc.new do
|
|
27
28
|
@logger.fatal "parent process unexpectedly terminated"
|
|
@@ -110,10 +111,10 @@ module ServerEngine
|
|
|
110
111
|
nil
|
|
111
112
|
end
|
|
112
113
|
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
114
|
+
def join
|
|
115
|
+
@pmon.join if @pmon
|
|
116
|
+
nil
|
|
117
|
+
end
|
|
117
118
|
|
|
118
119
|
def alive?
|
|
119
120
|
return false unless @pmon
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#
|
|
2
2
|
# ServerEngine
|
|
3
3
|
#
|
|
4
|
-
# Copyright (C) 2012-2013
|
|
4
|
+
# Copyright (C) 2012-2013 Sadayuki Furuhashi
|
|
5
5
|
#
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
|
@@ -23,6 +23,7 @@ module ServerEngine
|
|
|
23
23
|
def start_worker(wid)
|
|
24
24
|
w = create_worker(wid)
|
|
25
25
|
|
|
26
|
+
w.before_fork
|
|
26
27
|
begin
|
|
27
28
|
thread = Thread.new(&w.method(:main))
|
|
28
29
|
ensure
|
|
@@ -47,9 +48,9 @@ module ServerEngine
|
|
|
47
48
|
Thread.new { @worker.reload }
|
|
48
49
|
end
|
|
49
50
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
def join
|
|
52
|
+
@thread.join
|
|
53
|
+
end
|
|
53
54
|
|
|
54
55
|
def alive?
|
|
55
56
|
@thread.alive?
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#
|
|
2
2
|
# ServerEngine
|
|
3
3
|
#
|
|
4
|
-
# Copyright (C) 2012-2013
|
|
4
|
+
# Copyright (C) 2012-2013 Sadayuki Furuhashi
|
|
5
5
|
#
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
|
@@ -68,6 +68,12 @@ module ServerEngine
|
|
|
68
68
|
nil
|
|
69
69
|
end
|
|
70
70
|
|
|
71
|
+
def join_workers
|
|
72
|
+
@monitors.each {|m|
|
|
73
|
+
m.join if m
|
|
74
|
+
}
|
|
75
|
+
end
|
|
76
|
+
|
|
71
77
|
private
|
|
72
78
|
|
|
73
79
|
def reload_config
|
data/lib/serverengine/server.rb
CHANGED
data/lib/serverengine/utils.rb
CHANGED
data/lib/serverengine/version.rb
CHANGED
data/lib/serverengine/worker.rb
CHANGED
data/serverengine.gemspec
CHANGED
|
@@ -9,6 +9,7 @@ Gem::Specification.new do |gem|
|
|
|
9
9
|
gem.description = %q{A framework to implement robust multiprocess servers like Unicorn}
|
|
10
10
|
gem.summary = %q{ServerEngine - multiprocess server framework}
|
|
11
11
|
gem.homepage = "https://github.com/frsyuki/serverengine"
|
|
12
|
+
gem.license = "Apache 2.0"
|
|
12
13
|
|
|
13
14
|
gem.files = `git ls-files`.split($\)
|
|
14
15
|
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: serverengine
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.5.
|
|
4
|
+
version: 1.5.3
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-
|
|
12
|
+
date: 2013-07-01 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: sigdump
|
|
@@ -67,9 +67,10 @@ extensions: []
|
|
|
67
67
|
extra_rdoc_files: []
|
|
68
68
|
files:
|
|
69
69
|
- .gitignore
|
|
70
|
-
- COPYING
|
|
71
70
|
- Changelog
|
|
72
71
|
- Gemfile
|
|
72
|
+
- LICENSE
|
|
73
|
+
- NOTICE
|
|
73
74
|
- README.md
|
|
74
75
|
- Rakefile
|
|
75
76
|
- lib/serverengine.rb
|
|
@@ -98,7 +99,8 @@ files:
|
|
|
98
99
|
- spec/spec_helper.rb
|
|
99
100
|
- spec/supervisor_spec.rb
|
|
100
101
|
homepage: https://github.com/frsyuki/serverengine
|
|
101
|
-
licenses:
|
|
102
|
+
licenses:
|
|
103
|
+
- Apache 2.0
|
|
102
104
|
post_install_message:
|
|
103
105
|
rdoc_options: []
|
|
104
106
|
require_paths:
|
|
@@ -115,9 +117,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
115
117
|
- - ! '>='
|
|
116
118
|
- !ruby/object:Gem::Version
|
|
117
119
|
version: '0'
|
|
118
|
-
segments:
|
|
119
|
-
- 0
|
|
120
|
-
hash: 3345901740562467160
|
|
121
120
|
requirements: []
|
|
122
121
|
rubyforge_project:
|
|
123
122
|
rubygems_version: 1.8.23
|
|
@@ -133,3 +132,4 @@ test_files:
|
|
|
133
132
|
- spec/signal_thread_spec.rb
|
|
134
133
|
- spec/spec_helper.rb
|
|
135
134
|
- spec/supervisor_spec.rb
|
|
135
|
+
has_rdoc: false
|
data/COPYING
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
Copyright (C) 2011 FURUHASHI Sadayuki
|
|
2
|
-
|
|
3
|
-
Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
-
you may not use this file except in compliance with the License.
|
|
5
|
-
You may obtain a copy of the License at
|
|
6
|
-
|
|
7
|
-
http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
-
|
|
9
|
-
Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
See the License for the specific language governing permissions and
|
|
13
|
-
limitations under the License.
|
|
14
|
-
|