diff options
author | ianb <devnull@localhost> | 2007-06-26 17:28:28 +0000 |
---|---|---|
committer | ianb <devnull@localhost> | 2007-06-26 17:28:28 +0000 |
commit | 05136ba6a9ec63ea5cf8e5e84e118f92ea5b4339 (patch) | |
tree | 3a9fedafff4fb37b16a7347eb7e96550260b3e8b | |
parent | 051a3a7ec175e043f1374a949214c640712e3120 (diff) | |
download | paste-05136ba6a9ec63ea5cf8e5e84e118f92ea5b4339.tar.gz |
docstring misformatting; added news link
-rw-r--r-- | docs/index.txt | 2 | ||||
-rw-r--r-- | docs/paste-httpserver-threadpool.txt | 7 | ||||
-rwxr-xr-x | paste/httpserver.py | 2 | ||||
-rw-r--r-- | setup.cfg | 7 |
4 files changed, 14 insertions, 4 deletions
diff --git a/docs/index.txt b/docs/index.txt index c9ecf20..e000c56 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -41,6 +41,8 @@ Because of this it is planned that major new development will happen outside of Paste. This makes Paste a very stable and conservative piece of infrastructure for building on. This is the intention. +For up-to-the-minute status see the `news file <news.html>`_. + Paste for Administrators ------------------------ diff --git a/docs/paste-httpserver-threadpool.txt b/docs/paste-httpserver-threadpool.txt index afd1469..71ea81e 100644 --- a/docs/paste-httpserver-threadpool.txt +++ b/docs/paste-httpserver-threadpool.txt @@ -14,6 +14,7 @@ When a WSGI application is called, it's possible that it will block indefinitely. There's two basic ways you can manage threads: * Start a thread on every request, close it down when the thread stops + * Start a pool of threads, and reuse those threads for subsequent requests @@ -37,12 +38,18 @@ cases. The pool tracks all workers threads. Threads can be in a few states: * Idle, waiting for a request ("idle") + * Working on a request + - For a reasonable amount of time ("busy") + - For an unreasonably long amount of time ("hung") + * Thread that should die + - An exception has been injected that should kill the thread, but it hasn't happened yet ("dying") + - An exception has been injected, but the thread has persisted for an unreasonable amount of time ("zombie") diff --git a/paste/httpserver.py b/paste/httpserver.py index 1df18cb..ec342e6 100755 --- a/paste/httpserver.py +++ b/paste/httpserver.py @@ -1143,7 +1143,7 @@ def serve(application, host=None, port=None, handler=None, ssl_pem=None, This an optional SSL certificate file (via OpenSSL). You can supply ``*`` and a development-only certificate will be created for you, or you can generate a self-signed test PEM - certificate file as follows: + certificate file as follows:: $ openssl genrsa 1024 > host.key $ chmod 400 host.key @@ -9,9 +9,10 @@ command_packages = buildutils.pudge_command, buildutils.publish_command organization = Python Paste highlighter = pygments settings = no_about=true - link1=/deploy/ paste.deploy - link2=/script/ paste.script - link3=/download/ Download + link1=/news.html news + link2=/deploy/ paste.deploy + link3=/script/ paste.script + link4=/download/ download extra_credits=Hosting courtesy of <a href="http://tummy.com">Tummy.com</a> dest = docs/html docs = docs/index.txt docs/DeveloperGuidelines.txt docs/StyleGuide.txt |