summaryrefslogtreecommitdiff
path: root/wsgitools/scgi
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2012-11-01 11:04:53 +0100
committerHelmut Grohne <helmut@subdivi.de>2012-11-01 11:04:53 +0100
commit36a72a53a62c3e86ed67852a6767d0ddb0a437b9 (patch)
tree78fc5a1319ada651151565697c5c75151811ca2c /wsgitools/scgi
parent1bb2218f854e86229b76576850711c90a38a0bc9 (diff)
downloadwsgitools-36a72a53a62c3e86ed67852a6767d0ddb0a437b9.tar.gz
scgi.forkpool: similarly drop the error attribute
It can be stored inside the config attribute.
Diffstat (limited to 'wsgitools/scgi')
-rw-r--r--wsgitools/scgi/forkpool.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/wsgitools/scgi/forkpool.py b/wsgitools/scgi/forkpool.py
index 64d93ef..5931deb 100644
--- a/wsgitools/scgi/forkpool.py
+++ b/wsgitools/scgi/forkpool.py
@@ -185,7 +185,7 @@ class SCGIServer:
@param port: is the tcp port to listen on
@type interface: str
@param interface: is the interface to bind to (default: C{"localhost"})
- @param error: is a file-like object beeing passed as C{wsgi.error} in
+ @param error: is a file-like object beeing passed as C{wsgi.errors} in
environ
@type minworkers: int
@param minworkers: is the number of worker processes to spawn
@@ -210,8 +210,8 @@ class SCGIServer:
self.minworkers = minworkers
self.maxworkers = maxworkers
self.maxrequests = maxrequests
- self.config = config
- self.error = error
+ self.config = config.copy()
+ self.config["wsgi.errors"] = error
self.reusesocket = reusesocket
self.server = None # becomes a socket
# maps filedescriptors to WorkerStates
@@ -438,7 +438,6 @@ class SCGIServer:
_convert_environ(environ, multiprocess=True)
sfw = SocketFileWrapper(con, int(environ["CONTENT_LENGTH"]))
environ["wsgi.input"] = sfw
- environ["wsgi.errors"] = self.error
result = self.wsgiapp(environ, start_response)
assert hasattr(result, "__iter__")