From a3008fcf90de88a468212e3d30d61305f041e31c Mon Sep 17 00:00:00 2001 From: benoitc Date: Thu, 15 Apr 2010 15:04:26 +0200 Subject: [PATCH] add timeout in configuration doc. spotted by @jbergstriem --- doc/htdocs/configuration.html | 21 +++++++++++++++++++++ doc/htdocs/news.html | 26 +++++++++++++++++--------- doc/htdocs/usage.html | 1 + doc/site/configuration.rst | 22 ++++++++++++++++++++++ 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/doc/htdocs/configuration.html b/doc/htdocs/configuration.html index ae9a83e8..8289f38e 100644 --- a/doc/htdocs/configuration.html +++ b/doc/htdocs/configuration.html @@ -52,6 +52,25 @@

Gunicorn 0.5 introduced the ability to use a Python configuration file. Gunicorn will look for gunicorn.conf.py in the current working directory or what ever path is specified on the command line with the -c option.

Example gunicorn.conf.py

+

arbiter="egg:gunicorn", +backlog=2048, +bind='127.0.0.1:8000', +daemon=False, +debug=False, +default_proc_name = os.getcwd(), +group=None, +keepalive=2, +logfile='-', +loglevel='info', +pidfile=None, +proc_name = None, +spew=False, +timeout=30, +tmp_upload_dir=None, +umask="0", +user=None, +workers=1, +worker_connections=1000,

 arbiter = "egg:gunicorn"    # The arbiter to use for worker management
 backlog = 2048              # The listen queue size for the server socket
@@ -67,6 +86,8 @@ umask = 0                   # Umask to set when daemonizing
 user = None                 # Change process owner to user
 group = None                # Change process group to group
 proc_name = None            # Change the process name
+spew=False                  # Display trace
+timeout=30                  # Worker timeout
 tmp_upload_dir = None       # Set path used to store temporary uploads
 worker_connections=1000     # Maximum number of simultaneous connections
 
diff --git a/doc/htdocs/news.html b/doc/htdocs/news.html
index 49f35a9a..4998087b 100644
--- a/doc/htdocs/news.html
+++ b/doc/htdocs/news.html
@@ -50,12 +50,20 @@
   

 
News

 

+
0.7.2 / 2010-04-15

+
    
+
  • Added --spew option to help debugging (install a Trace hook)
    • 
+
  • Some fixes in async arbiters
    • 
+
  • Fix a bug in start_response on error
    • 
+

+

+

 
0.7.1 / 2010-04-01

 
    
 
  • Fix bug when responses have no body.
    • 
 

 

-

+

 
0.7.0 / 2010-03-26

 
 

-

+

 
0.6.5 / 2010-03-11

 
    
 
  • Fix pidfile
    • 
 
  • Fix Exception Error
    • 
 

 

-

+

 
0.6.4 / 2010-03-08

 
    
 
  • Use cStringIO for performance when possible.
    • 
 
  • Fix worker freeze when a remote connection closes unexpectedly.
    • 
 

 

-

+

 
0.6.3 / 2010-03-07

 
    
 
  • Make HTTP parsing faster.
    • 
 
  • Some fixes (see logs)
    • 
 

 

-

+

 
0.6.2 / 2010-03-01

 
    
 
  • Added support for chunked response.
    • 
@@ -96,7 +104,7 @@
 
  • Workers are now murdered by age (the oldest is killed first).
    • 
 

 

-

+

 
0.6.1 / 2010-02-24

 
    
 
  • Added gunicorn config file support for django admin command
    • 
@@ -104,21 +112,21 @@
 
  • Removed TTIN/TTOU from workers which blocked other signals.
    • 
 

 

-

+

 
0.6 / 2010-02-22

 
    
 
  • Added setproctitle
    • 
 
  • Change privilege switch behaviour. We now work like NGINX, master keeps the permissions, new uid/gid permissions are only set for workers.
    • 
 

 

-

+

 
0.5.1 / 2010-02-22

 
    
 
  • Fix umask
    • 
 
  • Added debian packaging
    • 
 

 

-

+

 
0.5 / 2010-02-20

 
    
 
  • Added configuration file handler.
    • 
diff --git a/doc/htdocs/usage.html b/doc/htdocs/usage.html
index 26801277..c72fc008 100644
--- a/doc/htdocs/usage.html
+++ b/doc/htdocs/usage.html
@@ -103,6 +103,7 @@ Options:
   --log-level=LOGLEVEL  Log level below which to silence messages. [info]
   --log-file=LOGFILE    Log to a file. - equals stdout. [-]
   -d, --debug           Debug mode. only 1 worker.
+  --spew                Install a trace hook
   --version             show program's version number and exit
   -h, --help            show this help message and exit
diff --git a/doc/site/configuration.rst b/doc/site/configuration.rst index 650f28d2..3043ad97 100644 --- a/doc/site/configuration.rst +++ b/doc/site/configuration.rst @@ -8,6 +8,26 @@ Gunicorn 0.5 introduced the ability to use a Python configuration file. Gunicorn Example gunicorn.conf.py ------------------------ + +arbiter="egg:gunicorn", +backlog=2048, +bind='127.0.0.1:8000', +daemon=False, +debug=False, +default_proc_name = os.getcwd(), +group=None, +keepalive=2, +logfile='-', +loglevel='info', +pidfile=None, +proc_name = None, +spew=False, +timeout=30, +tmp_upload_dir=None, +umask="0", +user=None, +workers=1, +worker_connections=1000, :: arbiter = "egg:gunicorn" # The arbiter to use for worker management @@ -24,6 +44,8 @@ Example gunicorn.conf.py user = None # Change process owner to user group = None # Change process group to group proc_name = None # Change the process name + spew=False # Display trace + timeout=30 # Worker timeout tmp_upload_dir = None # Set path used to store temporary uploads worker_connections=1000 # Maximum number of simultaneous connections