diff options
| author | Allan Saddi <allan@saddi.com> | 2007-05-17 16:08:05 +0000 |
|---|---|---|
| committer | Allan Saddi <allan@saddi.com> | 2007-05-17 16:08:05 +0000 |
| commit | 089258c7c6527534bda7c3a4d354e8966c78478f (patch) | |
| tree | bca712b3f227611bf992480cc681d4809ff0ceab | |
| parent | b16eb34a602b758f46194cc91db1dd15b06d239f (diff) | |
| download | flup-089258c7c6527534bda7c3a4d354e8966c78478f.tar.gz | |
Fix fcgi_fork so it can run on Solaris.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | flup/server/fcgi_fork.py | 9 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-05-17 Allan Saddi <allan@saddi.com> + + * Fix fcgi_fork so it can run on Solaris. Thanks to + Basil Crow for the patch. + 2007-01-22 Allan Saddi <allan@saddi.com> * Fix eunuchs import issue. diff --git a/flup/server/fcgi_fork.py b/flup/server/fcgi_fork.py index ae43752..53035a1 100644 --- a/flup/server/fcgi_fork.py +++ b/flup/server/fcgi_fork.py @@ -97,9 +97,12 @@ class WSGIServer(BaseFCGIServer, PreforkServer): import resource # Attempt to glean the maximum number of connections # from the OS. - maxProcs = resource.getrlimit(resource.RLIMIT_NPROC)[0] - maxConns = resource.getrlimit(resource.RLIMIT_NOFILE)[0] - maxConns = min(maxConns, maxProcs) + try: + maxProcs = resource.getrlimit(resource.RLIMIT_NPROC)[0] + maxConns = resource.getrlimit(resource.RLIMIT_NOFILE)[0] + maxConns = min(maxConns, maxProcs) + except AttributeError: + maxConns = resource.getrlimit(resource.RLIMIT_NOFILE)[0] except ImportError: maxConns = 100 # Just some made up number. maxReqs = maxConns |