10000 Rebuild after rebase. · alex-python/gunicorn@d8e6cb1 · GitHub
[go: up one dir, main page]
Skip to content

Commit d8e6cb1

Browse files
davispdavisp
committed
Rebuild after rebase.
1 parent 3c7d532 commit d8e6cb1

File tree

2 files changed

+59
-42
lines changed

2 files changed

+59
-42
lines changed

‎doc/htdocs/configure.html

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,30 @@
6161
</ul>
6262
</li>
6363
<li><a class="reference internal" href="#server-mechanics" id="id21">Server Mechanics</a><ul>
64-
<li><a class="reference internal" href="#daemon" id="id22">daemon</a></li>
65-
<li><a class="reference internal" href="#pidfile" id="id23">pidfile</a></li>
66-
<li><a class="reference internal" href="#user" id="id24">user</a></li>
67-
<li><a class="reference internal" href="#group" id="id25">group</a></li>
68-
<li><a class="reference internal" href="#umask" id="id26">umask</a></li>
69-
<li><a class="reference internal" href="#tmp-upload-dir" id="id27">tmp_upload_dir</a></li>
64+
<li><a class="reference internal" href="#preload-app" id="id22">preload_app</a></li>
65+
<li><a class="reference internal" href="#daemon" id="id23">daemon</a></li>
66+
<li><a class="reference internal" href="#pidfile" id="id24">pidfile</a></li>
67+
<li><a class="reference internal" href="#user" id="id25">user</a></li>
68+
<li><a class="reference internal" href="#group" id="id26">group</a></li>
69+
<li><a class="reference internal" href="#umask" id="id27">umask</a></li>
70+
<li><a class="reference internal" href="#tmp-upload-dir" id="id28">tmp_upload_dir</a></li>
7071
</ul>
7172
</li>
72-
<li><a class="reference internal" href="#logging" id="id28">Logging</a><ul>
73-
<li><a class="reference internal" href="#logfile" id="id29">logfile</a></li>
74-
<li><a class="reference internal" href="#loglevel" id="id30">loglevel</a></li>
73+
<li><a class="reference internal" href="#logging" id="id29">Logging</a><ul>
74+
<li><a class="reference internal" href="#logfile" id="id30">logfile</a></li>
75+
<li><a class="reference internal" href="#loglevel" id="id31">loglevel</a></li>
7576
</ul>
7677
</li>
77-
<li><a class="reference internal" href="#process-naming" id="id31">Process Naming</a><ul>
78-
<li><a class="reference internal" href="#proc-name" id="id32">proc_name</a></li>
79-
<li><a class="reference internal" href="#default-proc-name" id="id33">default_proc_name</a></li>
78+
<li><a cla 6D40 ss="reference internal" href="#process-naming" id="id32">Process Naming</a><ul>
79+
<li><a class="reference internal" href="#proc-name" id="id33">proc_name</a></li>
80+
<li><a class="reference internal" href="#default-proc-name" id="id34">default_proc_name</a></li>
8081
</ul>
8182
</li>
82-
<li><a class="reference internal" href="#server-hooks" id="id34">Server Hooks</a><ul>
83-
<li><a class="reference internal" href="#pre-fork" id="id35">pre_fork</a></li>
84-
<li><a class="reference internal" href="#post-fork" id="id36">post_fork</a></li>
85-
<li><a class="reference internal" href="#pre-exec" id="id37">pre_exec</a></li>
83+
<li><a class="reference internal" href="#server-hooks" id="id35">Server Hooks</a><ul>
84+
<li><a class="reference internal" href="#pre-fork" id="id36">pre_fork</a></li>
85+
<li><a class="reference internal" href="#post-fork" id="id37">post_fork</a></li>
86+
<li><a class="reference internal" href="#when-ready" id="id38">when_ready</a></li>
87+
<li><a class="reference internal" href="#pre-exec" id="id39">pre_exec</a></li>
8688
</ul>
8789
</li>
8890
</ul>
@@ -281,7 +283,7 @@ <h3><a class="toc-backref" href="#contents">Debugging</a></h3>
281283
<div class="section" id="debug">
282284
<h4><a class="toc-backref" href="#contents">debug</a></h4>
283285
<ul class="simple">
284-
<li><tt class="docutils literal"><span class="pre">-d,</span> <span class="pre">--debug</span></tt></li>
286+
<li><tt class="docutils literal"><span class="pre">--debug</span></tt></li>
285287
<li><tt class="docutils literal">False</tt></li>
286288
</ul>
287289
<p>Turn on debugging in the server.</p>
@@ -300,6 +302,18 @@ <h4><a class="toc-backref" href="#contents">spew</a></h4>
300302
</div>
301303
<div class="section" id="server-mechanics">
302304
<h3><a class="toc-backref" href="#contents">Server Mechanics</a></h3>
305+
<div class="section" id="preload-app">
306+
<h4><a class="toc-backref" href="#contents">preload_app</a></h4>
307+
<ul class="simple">
308+
<li><tt class="docutils literal"><span class="pre">--preload</span></tt></li>
309+
<li><tt class="docutils literal">False</tt></li>
310+
</ul>
311+
<p>Load application code before the worker processes are forked.</p>
312+
<p>By preloading an application you can save some RAM resources as well as
313+
speed up server boot times. Although, if you defer application loading
314+
to each worker process, you can reload your application code easily by
315+
restarting workers.</p>
316+
</div>
303317
<div class="section" id="daemon">
304318
<h4><a class="toc-backref" href="#contents">daemon</a></h4>
305319
<ul class="simple">
@@ -444,6 +458,18 @@ <h4><a class="toc-backref" href="#contents">post_fork</a></h4>
444458
<p>The callable needs to accept two instance variables for the Arbiter and
445459
new Worker.</p>
446460
</div>
461+
<div class="section" id="when-ready">
462+
<h4><a class="toc-backref" href="#contents">when_ready</a></h4>
463+
<ul>
464+
<li><pre class="first literal-block">
465+
def def_start_server(server):
466+
pass
467+
</pre>
468+
</li>
469+
</ul>
470+
<p>Called just after the server is started.</p>
471+
<p>The callable needs to accept a single instance variable for the Arbiter.</p>
472+
</div>
447473
<div class="section" id="pre-exec">
448474
<h4><a class="toc-backref" href="#contents">pre_exec</a></h4>
449475
<ul>

‎doc/htdocs/news.html

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,8 @@
2727
</div>
2828
<div id="content">
2929
<div class="document">
30-
<div class="section" id="dev-2010-05-17">
31-
<h2>0.9.0-dev / 2010-05-17</h2>
32-
<ul class="simple">
33-
<li>Fix pidfile</li>
34-
<li>Fix QUIT/HUP in async workers</li>
35-
<li>Fix reexec</li>
36-
<li>Documentation improvments</li>
37-
</ul>
38-
</div>
3930
<div class="section" id="id1">
40-
<h1>0.9.1 / 2010-05-26</h1>
31+
<h2>0.9.1 / 2010-05-26</h2>
4132
<ul class="simple">
4233
<li>Support https via X-Forwarded-Protocol or X-Forwarded-Ssl headers</li>
4334
<li>Fix configuration</li>
@@ -46,7 +37,7 @@ <h1>0.9.1 / 2010-05-26</h1>
4637
</ul>
4738
</div>
4839
<div class="section" id="id2">
49-
<h1>0.9.0 / 2010-05-24</h1>
40+
<h2>0.9.0 / 2010-05-24</h2>
5041
<ul class="simple">
5142
<li>Added <em>when_ready</em> hook. Called just after the server is started</li>
5243
<li>Added <em>preload</em> setting. Load application code before the worker processes
@@ -59,15 +50,15 @@ <h1>0.9.0 / 2010-05-24</h1>
5950
</ul>
6051
</div>
6152
<div class="section" id="id3">
62-
<h1>0.8.1 / 2010-04-29</h1>
53+
<h2>0.8.1 / 2010-04-29</h2>
6354
<ul class="simple">
6455
<li>Fix builtins import in config</li>
6556
<li>Fix installation with pip</li>
6657
<li>Fix Tornado WSGI support</li>
6758
<li>Delay application loading until after processing all configuration</li>
6859
</ul>
6960
</div>
70-
<div class="section" id="id2">
61+
<div class="section" id="id4">
7162
<h2>0.8.0 / 2010-04-22</h2>
7263
<ul class="simple">
7364
<li>Refactored Worker management for better async support. Now use the -k option
@@ -76,21 +67,21 @@ <h2>0.8.0 / 2010-04-22</h2>
7667
</ul>
7768
</div>
7869
<div class="section" id="id5">
79-
<h1>0.7.2 / 2010-04-15</h1>
70+
<h2>0.7.2 / 2010-04-15</h2>
8071
<ul class="simple">
8172
<li>Added --spew option to help debugging (installs a system trace hook)</li>
8273
<li>Some fixes in async arbiters</li>
8374
<li>Fix a bug in start_response on error</li>
8475
</ul>
8576
</div>
86-
<div class="section" id="id4">
77+
<div class="section" id="id6">
8778
<h2>0.7.1 / 2010-04-01</h2>
8879
<ul class="simple">
8980
<li>Fix bug when responses have no body.</li>
9081
</ul>
9182
</div>
9283
<div class="section" id="id7">
93-
<h1>0.7.0 / 2010-03-26</h1>
84+
<h2>0.7.0 / 2010-03-26</h2>
9485
<ul class="simple">
9586
<li>Added support for <a class="reference external" href="http://eventlet.net">Eventlet</a> and <a class="reference external" href="http://gevent.org">Gevent</a> based workers.</li>
9687
<li>Added <a class="reference external" href="http://dev.w3.org/html5/websockets/">Websockets</a> support</li>
@@ -100,27 +91,27 @@ <h1>0.7.0 / 2010-03-26</h1>
10091
</ul>
10192
</div>
10293
<div class="section" id="id8">
103-
<h1>0.6.5 / 2010-03-11</h1>
94+
<h2>0.6.5 / 2010-03-11</h2>
10495
<ul class="simple">
10596
<li>Fix pidfile handling</li>
10697
<li>Fix Exception Error</li>
10798
</ul>
10899
</div>
109-
<div class="section" id="id7">
100+
<div class="section" id="id9">
110101
<h2>0.6.4 / 2010-03-08</h2>
111102
<ul class="simple">
112103
<li>Use cStringIO for performance when possible.</li>
113104
<li>Fix worker freeze when a remote connection closes unexpectedly.</li>
114105
</ul>
115106
</div>
116-
<div class="section" id="id8">
107+
<div class="section" id="id10">
117108
<h2>0.6.3 / 2010-03-07</h2>
118109
<ul class="simple">
119110
<li>Make HTTP parsing faster.</li>
120111
<li>Various bug fixes</li>
121112
</ul>
122113
</div>
123-
<div class="section" id="id9">
114+
<div class="section" id="id11">
124115
<h2>0.6.2 / 2010-03-01</h2>
125116
<ul class="simple">
126117
<li>Added support for chunked response.</li>
@@ -131,30 +122,30 @@ <h2>0.6.2 / 2010-03-01</h2>
131122
<li>Workers are now murdered by age (the oldest is killed first).</li>
132123
</ul>
133124
</div>
134-
<div class="section" id="id10">
125+
<div class="section" id="id12">
135126
<h2>0.6.1 / 2010-02-24</h2>
136127
<ul class="simple">
137128
<li>Added gunicorn config file support for Django admin command</li>
138129
<li>Fix gunicorn config file. -c was broken.</li>
139130
<li>Removed TTIN/TTOU from workers which blocked other signals.</li>
140131
</ul>
141132
</div>
142-
<div class="section" id="id11">
133+
<div class="section" id="id13">
143134
<h2>0.6 / 2010-02-22</h2>
144135
<ul class="simple">
145136
<li>Added setproctitle support</li>
146137
<li>Change privilege switch behavior. We now work like NGINX, master keeps the
147138
permissions, new uid/gid permissions are only set for workers.</li>
148139
</ul>
149140
</div>
150-
<div class="section" id="id12">
141+
<div class="section" id="id14">
151142
<h2>0.5.1 / 2010-02-22</h2>
152143
<ul class="simple">
153144
<li>Fix umask</li>
154145
<li>Added Debian packaging</li>
155146
</ul>
156147
</div>
157-
<div class="section" id="id13">
148+
<div class="section" id="id15">
158149
<h2>0.5 / 2010-02-20</h2>
159150
<ul class="simple">
160151
<li>Added <a class="reference external" href="configuration.html">configuration file</a> handler.</li>
@@ -179,4 +170,4 @@ <h2>0.5 / 2010-02-20</h2>
179170
</div>
180171
</div>
181172
</body>
182-
</html>
173+
</html>

0 commit comments

Comments
 (0)
0