From 089258c7c6527534bda7c3a4d354e8966c78478f Mon Sep 17 00:00:00 2001 From: Allan Saddi Date: Thu, 17 May 2007 16:08:05 +0000 Subject: Fix fcgi_fork so it can run on Solaris. --- ChangeLog | 5 +++++ flup/server/fcgi_fork.py | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9722fcd..788037b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-05-17 Allan Saddi + + * Fix fcgi_fork so it can run on Solaris. Thanks to + Basil Crow for the patch. + 2007-01-22 Allan Saddi * 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 -- cgit v1.2.1