unicorn 5.3.1 → 6.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.manifest +10 -5
- data/.olddoc.yml +15 -7
- data/Application_Timeouts +4 -4
- data/CONTRIBUTORS +6 -2
- data/Documentation/.gitignore +1 -3
- data/Documentation/unicorn.1 +222 -0
- data/Documentation/unicorn_rails.1 +207 -0
- data/FAQ +1 -1
- data/GIT-VERSION-FILE +1 -1
- data/GIT-VERSION-GEN +1 -1
- data/GNUmakefile +117 -57
- data/HACKING +2 -9
- data/ISSUES +33 -32
- data/KNOWN_ISSUES +2 -2
- data/LATEST +16 -95
- data/LICENSE +2 -2
- data/Links +13 -11
- data/NEWS +239 -0
- data/README +27 -14
- data/SIGNALS +1 -1
- data/Sandbox +5 -5
- data/archive/slrnpull.conf +1 -1
- data/bin/unicorn +3 -1
- data/bin/unicorn_rails +2 -2
- data/examples/big_app_gc.rb +1 -1
- data/examples/logrotate.conf +3 -3
- data/examples/nginx.conf +4 -3
- data/examples/unicorn.conf.minimal.rb +2 -2
- data/examples/unicorn.conf.rb +2 -2
- data/examples/unicorn@.service +7 -0
- data/ext/unicorn_http/c_util.h +5 -13
- data/ext/unicorn_http/common_field_optimization.h +23 -6
- data/ext/unicorn_http/epollexclusive.h +124 -0
- data/ext/unicorn_http/ext_help.h +0 -24
- data/ext/unicorn_http/extconf.rb +32 -6
- data/ext/unicorn_http/global_variables.h +3 -3
- data/ext/unicorn_http/httpdate.c +3 -2
- data/ext/unicorn_http/unicorn_http.c +277 -237
- data/ext/unicorn_http/unicorn_http.rl +67 -27
- data/lib/unicorn/configurator.rb +26 -5
- data/lib/unicorn/http_request.rb +13 -3
- data/lib/unicorn/http_response.rb +3 -2
- data/lib/unicorn/http_server.rb +76 -51
- data/lib/unicorn/launcher.rb +1 -1
- data/lib/unicorn/oob_gc.rb +5 -5
- data/lib/unicorn/select_waiter.rb +6 -0
- data/lib/unicorn/socket_helper.rb +4 -3
- data/lib/unicorn/tmpio.rb +8 -2
- data/lib/unicorn/util.rb +3 -3
- data/lib/unicorn/version.rb +1 -1
- data/lib/unicorn/worker.rb +16 -2
- data/lib/unicorn.rb +25 -10
- data/man/man1/unicorn.1 +88 -85
- data/man/man1/unicorn_rails.1 +79 -81
- data/t/GNUmakefile +3 -72
- data/t/README +4 -4
- data/t/t0301-no-default-middleware-ignored-in-config.sh +25 -0
- data/t/t0301.ru +13 -0
- data/t/test-lib.sh +2 -1
- data/test/benchmark/README +14 -4
- data/test/benchmark/ddstream.ru +50 -0
- data/test/benchmark/readinput.ru +40 -0
- data/test/benchmark/uconnect.perl +66 -0
- data/test/exec/test_exec.rb +20 -19
- data/test/test_helper.rb +38 -30
- data/test/unit/test_ccc.rb +5 -4
- data/test/unit/test_droplet.rb +1 -1
- data/test/unit/test_http_parser.rb +16 -0
- data/test/unit/test_http_parser_ng.rb +81 -0
- data/test/unit/test_request.rb +10 -10
- data/test/unit/test_server.rb +86 -12
- data/test/unit/test_signals.rb +8 -8
- data/test/unit/test_socket_helper.rb +5 -5
- data/test/unit/test_upload.rb +9 -14
- data/test/unit/test_util.rb +29 -3
- data/test/unit/test_waiter.rb +34 -0
- data/unicorn.gemspec +8 -7
- metadata +19 -13
- data/Documentation/GNUmakefile +0 -30
- data/Documentation/unicorn.1.txt +0 -187
- data/Documentation/unicorn_rails.1.txt +0 -175
- data/t/hijack.ru +0 -43
- data/t/t0200-rack-hijack.sh +0 -30
@@ -1,175 +0,0 @@
|
|
1
|
-
% UNICORN_RAILS(1) Unicorn User Manual
|
2
|
-
% The Unicorn Community <unicorn-public@bogomips.org>
|
3
|
-
% September 17, 2009
|
4
|
-
|
5
|
-
# NAME
|
6
|
-
|
7
|
-
unicorn_rails - unicorn launcher for Rails 1.x and 2.x users
|
8
|
-
|
9
|
-
# SYNOPSIS
|
10
|
-
|
11
|
-
unicorn_rails [-c CONFIG_FILE] [-E RAILS_ENV] [-D] [RACKUP_FILE]
|
12
|
-
|
13
|
-
# DESCRIPTION
|
14
|
-
|
15
|
-
A rackup(1)-like command to launch Rails applications using Unicorn. It
|
16
|
-
is expected to be started in your Rails application root (RAILS_ROOT),
|
17
|
-
but the "working_directory" directive may be used in the CONFIG_FILE.
|
18
|
-
|
19
|
-
It is designed to help Rails 1.x and 2.y users transition to Rack, but
|
20
|
-
it is NOT needed for Rails 3 applications. Rails 3 users are encouraged
|
21
|
-
to use unicorn(1) instead of unicorn_rails(1). Users of Rails 1.x/2.y
|
22
|
-
may also use unicorn(1) instead of unicorn_rails(1).
|
23
|
-
|
24
|
-
The outward interface resembles rackup(1), the internals and default
|
25
|
-
middleware loading is designed like the `script/server` command
|
26
|
-
distributed with Rails.
|
27
|
-
|
28
|
-
While Unicorn takes a myriad of command-line options for compatibility
|
29
|
-
with ruby(1) and rackup(1), it is recommended to stick to the few
|
30
|
-
command-line options specified in the SYNOPSIS and use the CONFIG_FILE
|
31
|
-
as much as possible.
|
32
|
-
|
33
|
-
# UNICORN OPTIONS
|
34
|
-
-c, \--config-file CONFIG_FILE
|
35
|
-
: Path to the Unicorn-specific config file. The config file is
|
36
|
-
implemented as a Ruby DSL, so Ruby code may executed.
|
37
|
-
See the RDoc/ri for the *Unicorn::Configurator* class for the full
|
38
|
-
list of directives available from the DSL.
|
39
|
-
Using an absolute path for for CONFIG_FILE is recommended as it
|
40
|
-
makes multiple instances of Unicorn easily distinguishable when
|
41
|
-
viewing ps(1) output.
|
42
|
-
|
43
|
-
-D, \--daemonize
|
44
|
-
: Run daemonized in the background. The process is detached from
|
45
|
-
the controlling terminal and stdin is redirected to "/dev/null".
|
46
|
-
Unlike many common UNIX daemons, we do not chdir to \"/\"
|
47
|
-
upon daemonization to allow more control over the startup/upgrade
|
48
|
-
process.
|
49
|
-
Unless specified in the CONFIG_FILE, stderr and stdout will
|
50
|
-
also be redirected to "/dev/null".
|
51
|
-
Daemonization will _skip_ loading of the *Rails::Rack::LogTailer*
|
52
|
-
middleware under Rails \>\= 2.3.x.
|
53
|
-
By default, unicorn\_rails(1) will create a PID file in
|
54
|
-
_\"RAILS\_ROOT/tmp/pids/unicorn.pid\"_. You may override this
|
55
|
-
by specifying the "pid" directive to override this Unicorn config file.
|
56
|
-
|
57
|
-
-E, \--env RAILS_ENV
|
58
|
-
: Run under the given RAILS_ENV. This sets the RAILS_ENV environment
|
59
|
-
variable. Acceptable values are exactly those you expect in your Rails
|
60
|
-
application, typically "development" or "production".
|
61
|
-
|
62
|
-
-l, \--listen ADDRESS
|
63
|
-
: Listens on a given ADDRESS. ADDRESS may be in the form of
|
64
|
-
HOST:PORT or PATH, HOST:PORT is taken to mean a TCP socket
|
65
|
-
and PATH is meant to be a path to a UNIX domain socket.
|
66
|
-
Defaults to "0.0.0.0:8080" (all addresses on TCP port 8080).
|
67
|
-
For production deployments, specifying the "listen" directive in
|
68
|
-
CONFIG_FILE is recommended as it allows fine-tuning of socket
|
69
|
-
options.
|
70
|
-
|
71
|
-
# RACKUP COMPATIBILITY OPTIONS
|
72
|
-
-o, \--host HOST
|
73
|
-
: Listen on a TCP socket belonging to HOST, default is
|
74
|
-
"0.0.0.0" (all addresses).
|
75
|
-
If specified multiple times on the command-line, only the
|
76
|
-
last-specified value takes effect.
|
77
|
-
This option only exists for compatibility with the rackup(1) command,
|
78
|
-
use of "-l"/"\--listen" switch is recommended instead.
|
79
|
-
|
80
|
-
-p, \--port PORT
|
81
|
-
: Listen on the specified TCP PORT, default is 8080.
|
82
|
-
If specified multiple times on the command-line, only the last-specified
|
83
|
-
value takes effect.
|
84
|
-
This option only exists for compatibility with the rackup(1) command,
|
85
|
-
use of "-l"/"\--listen" switch is recommended instead.
|
86
|
-
|
87
|
-
\--path PATH
|
88
|
-
: Mounts the Rails application at the given PATH (instead of "/").
|
89
|
-
This is equivalent to setting the RAILS_RELATIVE_URL_ROOT
|
90
|
-
environment variable. This is only supported under Rails 2.3
|
91
|
-
or later at the moment.
|
92
|
-
|
93
|
-
# RUBY OPTIONS
|
94
|
-
-e, \--eval LINE
|
95
|
-
: Evaluate a LINE of Ruby code. This evaluation happens
|
96
|
-
immediately as the command-line is being parsed.
|
97
|
-
|
98
|
-
-d, \--debug
|
99
|
-
: Turn on debug mode, the $DEBUG variable is set to true.
|
100
|
-
For Rails \>\= 2.3.x, this loads the *Rails::Rack::Debugger*
|
101
|
-
middleware.
|
102
|
-
|
103
|
-
-w, \--warn
|
104
|
-
: Turn on verbose warnings, the $VERBOSE variable is set to true.
|
105
|
-
|
106
|
-
-I, \--include PATH
|
107
|
-
: specify $LOAD_PATH. PATH will be prepended to $LOAD_PATH.
|
108
|
-
The \':\' character may be used to delimit multiple directories.
|
109
|
-
This directive may be used more than once. Modifications to
|
110
|
-
$LOAD_PATH take place immediately and in the order they were
|
111
|
-
specified on the command-line.
|
112
|
-
|
113
|
-
-r, \--require LIBRARY
|
114
|
-
: require a specified LIBRARY before executing the application. The
|
115
|
-
\"require\" statement will be executed immediately and in the order
|
116
|
-
they were specified on the command-line.
|
117
|
-
|
118
|
-
# RACKUP FILE
|
119
|
-
|
120
|
-
This defaults to \"config.ru\" in RAILS_ROOT. It should be the same
|
121
|
-
file used by rackup(1) and other Rack launchers, it uses the
|
122
|
-
*Rack::Builder* DSL. Unlike many other Rack applications, RACKUP_FILE
|
123
|
-
is completely _optional_ for Rails, but may be used to disable some
|
124
|
-
of the default middleware for performance.
|
125
|
-
|
126
|
-
Embedded command-line options are mostly parsed for compatibility
|
127
|
-
with rackup(1) but strongly discouraged.
|
128
|
-
|
129
|
-
# ENVIRONMENT VARIABLES
|
130
|
-
|
131
|
-
The RAILS_ENV variable is set by the aforementioned \-E switch. The
|
132
|
-
RAILS_RELATIVE_URL_ROOT is set by the aforementioned \--path switch.
|
133
|
-
Either of these variables may also be set in the shell or the Unicorn
|
134
|
-
CONFIG_FILE. All application or library-specific environment variables
|
135
|
-
(e.g. TMPDIR, RAILS_ASSET_ID) may always be set in the Unicorn
|
136
|
-
CONFIG_FILE in addition to the spawning shell. When transparently
|
137
|
-
upgrading Unicorn, all environment variables set in the old master
|
138
|
-
process are inherited by the new master process. Unicorn only uses (and
|
139
|
-
will overwrite) the UNICORN_FD environment variable internally when
|
140
|
-
doing transparent upgrades.
|
141
|
-
|
142
|
-
# SIGNALS
|
143
|
-
|
144
|
-
The following UNIX signals may be sent to the master process:
|
145
|
-
|
146
|
-
* HUP - reload config file, app, and gracefully restart all workers
|
147
|
-
* INT/TERM - quick shutdown, kills all workers immediately
|
148
|
-
* QUIT - graceful shutdown, waits for workers to finish their
|
149
|
-
current request before finishing.
|
150
|
-
* USR1 - reopen all logs owned by the master and all workers
|
151
|
-
See Unicorn::Util.reopen_logs for what is considered a log.
|
152
|
-
* USR2 - reexecute the running binary. A separate QUIT
|
153
|
-
should be sent to the original process once the child is verified to
|
154
|
-
be up and running.
|
155
|
-
* WINCH - gracefully stops workers but keep the master running.
|
156
|
-
This will only work for daemonized processes.
|
157
|
-
* TTIN - increment the number of worker processes by one
|
158
|
-
* TTOU - decrement the number of worker processes by one
|
159
|
-
|
160
|
-
See the [SIGNALS][4] document for full description of all signals
|
161
|
-
used by Unicorn.
|
162
|
-
|
163
|
-
# SEE ALSO
|
164
|
-
|
165
|
-
* unicorn(1)
|
166
|
-
* *Rack::Builder* ri/RDoc
|
167
|
-
* *Unicorn::Configurator* ri/RDoc
|
168
|
-
* [Unicorn RDoc][1]
|
169
|
-
* [Rack RDoc][2]
|
170
|
-
* [Rackup HowTo][3]
|
171
|
-
|
172
|
-
[1]: https://bogomips.org/unicorn/
|
173
|
-
[2]: http://www.rubydoc.info/github/rack/rack/
|
174
|
-
[3]: https://github.com/rack/rack/wiki/tutorial-rackup-howto
|
175
|
-
[4]: https://bogomips.org/unicorn/SIGNALS.html
|
data/t/hijack.ru
DELETED
@@ -1,43 +0,0 @@
|
|
1
|
-
use Rack::Lint
|
2
|
-
use Rack::ContentLength
|
3
|
-
use Rack::ContentType, "text/plain"
|
4
|
-
class DieIfUsed
|
5
|
-
@@n = 0
|
6
|
-
def each
|
7
|
-
abort "body.each called after response hijack\n"
|
8
|
-
end
|
9
|
-
|
10
|
-
def close
|
11
|
-
warn "closed DieIfUsed #{@@n += 1}\n"
|
12
|
-
end
|
13
|
-
end
|
14
|
-
run lambda { |env|
|
15
|
-
case env["PATH_INFO"]
|
16
|
-
when "/hijack_req"
|
17
|
-
if env["rack.hijack?"]
|
18
|
-
io = env["rack.hijack"].call
|
19
|
-
if io.respond_to?(:read_nonblock) &&
|
20
|
-
env["rack.hijack_io"].respond_to?(:read_nonblock)
|
21
|
-
|
22
|
-
# exercise both, since we Rack::Lint may use different objects
|
23
|
-
env["rack.hijack_io"].write("HTTP/1.0 200 OK\r\n\r\n")
|
24
|
-
io.write("request.hijacked")
|
25
|
-
io.close
|
26
|
-
return [ 500, {}, DieIfUsed.new ]
|
27
|
-
end
|
28
|
-
end
|
29
|
-
[ 500, {}, [ "hijack BAD\n" ] ]
|
30
|
-
when "/hijack_res"
|
31
|
-
r = "response.hijacked"
|
32
|
-
[ 200,
|
33
|
-
{
|
34
|
-
"Content-Length" => r.bytesize.to_s,
|
35
|
-
"rack.hijack" => proc do |io|
|
36
|
-
io.write(r)
|
37
|
-
io.close
|
38
|
-
end
|
39
|
-
},
|
40
|
-
DieIfUsed.new
|
41
|
-
]
|
42
|
-
end
|
43
|
-
}
|
data/t/t0200-rack-hijack.sh
DELETED
@@ -1,30 +0,0 @@
|
|
1
|
-
#!/bin/sh
|
2
|
-
. ./test-lib.sh
|
3
|
-
t_plan 5 "rack.hijack tests (Rack 1.5+ (Rack::VERSION >= [ 1,2]))"
|
4
|
-
|
5
|
-
t_begin "setup and start" && {
|
6
|
-
unicorn_setup
|
7
|
-
unicorn -D -c $unicorn_config hijack.ru
|
8
|
-
unicorn_wait_start
|
9
|
-
}
|
10
|
-
|
11
|
-
t_begin "check request hijack" && {
|
12
|
-
test "xrequest.hijacked" = x"$(curl -sSfv http://$listen/hijack_req)"
|
13
|
-
}
|
14
|
-
|
15
|
-
t_begin "check response hijack" && {
|
16
|
-
test "xresponse.hijacked" = x"$(curl -sSfv http://$listen/hijack_res)"
|
17
|
-
}
|
18
|
-
|
19
|
-
t_begin "killing succeeds after hijack" && {
|
20
|
-
kill $unicorn_pid
|
21
|
-
}
|
22
|
-
|
23
|
-
t_begin "check stderr for hijacked body close" && {
|
24
|
-
check_stderr
|
25
|
-
grep 'closed DieIfUsed 1\>' $r_err
|
26
|
-
grep 'closed DieIfUsed 2\>' $r_err
|
27
|
-
! grep 'closed DieIfUsed 3\>' $r_err
|
28
|
-
}
|
29
|
-
|
30
|
-
t_done
|