From 1bb2218f854e86229b76576850711c90a38a0bc9 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 1 Nov 2012 10:41:59 +0100 Subject: scgi.forkpool: reduce instance attributes The interface and port attributes are always used together. Combine them in order to reduce complexity. --- wsgitools/scgi/forkpool.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'wsgitools') diff --git a/wsgitools/scgi/forkpool.py b/wsgitools/scgi/forkpool.py index cdd50f0..64d93ef 100644 --- a/wsgitools/scgi/forkpool.py +++ b/wsgitools/scgi/forkpool.py @@ -206,8 +206,7 @@ class SCGIServer: """ assert hasattr(error, "write") self.wsgiapp = wsgiapp - self.port = port - self.interface = interface + self.bind_address = (interface, port) self.minworkers = minworkers self.maxworkers = maxworkers self.maxrequests = maxrequests @@ -237,7 +236,7 @@ class SCGIServer: if self.reusesocket is None: self.server = socket.socket() self.server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.server.bind((self.interface, self.port)) + self.server.bind(self.bind_address) self.server.listen(5) else: self.server = self.reusesocket -- cgit v1.2.3 From 36a72a53a62c3e86ed67852a6767d0ddb0a437b9 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 1 Nov 2012 11:04:53 +0100 Subject: scgi.forkpool: similarly drop the error attribute It can be stored inside the config attribute. --- wsgitools/scgi/forkpool.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'wsgitools') 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__") -- cgit v1.2.3 From dd8148e11636d6c3792e8ceb03478048ae8eb571 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 1 Nov 2012 11:33:34 +0100 Subject: scgi.forkpool: fixed wrong assertion The forkpool server was incompatible with dumb generators. They only call start_response when being asked for the first output element, but the forkpool server was wrongly requiring start_response to be called before returning the iterator. --- wsgitools/scgi/forkpool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wsgitools') diff --git a/wsgitools/scgi/forkpool.py b/wsgitools/scgi/forkpool.py index 5931deb..52240f2 100644 --- a/wsgitools/scgi/forkpool.py +++ b/wsgitools/scgi/forkpool.py @@ -448,9 +448,9 @@ class SCGIServer: while sent > 0: sent = result.transfer(con) else: - assert response_head[0] is not None result_iter = iter(result) for data in result_iter: + assert response_head[0] is not None assert isinstance(data, str) dumbsend(data) if response_head[0] != True: -- cgit v1.2.3 From 576bd830cf77dae71b2cd10f0241667fe48930a6 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 1 Nov 2012 11:35:49 +0100 Subject: scgi.forkpool: implement RLIMIT_CPU The limit is only set on workers does not apply to the master. Upon reaching the soft limit the worker terminates after finished the current request. --- wsgitools/scgi/forkpool.py | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'wsgitools') diff --git a/wsgitools/scgi/forkpool.py b/wsgitools/scgi/forkpool.py index 52240f2..f27cd25 100644 --- a/wsgitools/scgi/forkpool.py +++ b/wsgitools/scgi/forkpool.py @@ -5,6 +5,10 @@ It works with multiple processes that are periodically cleaned up to prevent memory leaks having an impact to the system. """ +try: + import resource +except ImportError: + resource = None import socket import os import select @@ -178,7 +182,7 @@ class SCGIServer: def __init__(self, wsgiapp, port, interface="localhost", error=sys.stderr, minworkers=2, maxworkers=32, maxrequests=1000, config={}, - reusesocket=None): + reusesocket=None, cpulimit=None): """ @param wsgiapp: is the WSGI application to be run. @type port: int @@ -203,6 +207,12 @@ class SCGIServer: Instead use given socket as listen socket. The passed socket must be set up for accepting tcp connections (i.e. C{AF_INET}, C{SOCK_STREAM} with bind and listen called). + @type cpulimit: (int, int) + @param cpulimit: a pair of soft and hard cpu time limit in seconds. + This limit is installed for each worker using RLIMIT_CPU if + resource limits are available to this platform. After reaching + the soft limit workers will continue to process the current + request and then cleanly terminate. """ assert hasattr(error, "write") self.wsgiapp = wsgiapp @@ -213,6 +223,10 @@ class SCGIServer: self.config = config.copy() self.config["wsgi.errors"] = error self.reusesocket = reusesocket + # cpulimit changes meaning: + # master: None or a tuple denoting the limit to be configured. + # worker: boolean denoting whether the limit is reached. + self.cpulimit = cpulimit self.server = None # becomes a socket # maps filedescriptors to WorkerStates self.workers = {} @@ -302,6 +316,15 @@ class SCGIServer: else: self.running = False + def sigxcpuhandler(self, sig=None, stackframe=None): + """ + Signal hanlder function for the SIGXCUP signal. It is sent to a + worker when the soft RLIMIT_CPU is crossed. + @param sig: ignored for usage with signal.signal + @param stackframe: ignored for usage with signal.signal + """ + self.cpulimit = True + def spawnworker(self): """ internal! spawns a single worker @@ -317,6 +340,11 @@ class SCGIServer: worker.sock.close() del self.workers + if self.cpulimit and resource: + signal.signal(signal.SIGXCPU, self.sigxcpuhandler) + resource.setrlimit(resource.RLIMIT_CPU, self.cpulimit) + self.cpulimit = False + try: self.work(worksock) except socket.error: @@ -343,6 +371,8 @@ class SCGIServer: worksock.sendall('1') # tell server we're working self.process(con) worksock.sendall('0') # tell server we've finished + if self.cpulimit: + break def process(self, con): """ -- cgit v1.2.3 From 30e8af066f3a091cf58443b8e45068c55bf0d68b Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sun, 10 Mar 2013 14:20:25 +0100 Subject: forkpool: add a per-request timelimit --- wsgitools/scgi/forkpool.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'wsgitools') diff --git a/wsgitools/scgi/forkpool.py b/wsgitools/scgi/forkpool.py index f27cd25..514094f 100644 --- a/wsgitools/scgi/forkpool.py +++ b/wsgitools/scgi/forkpool.py @@ -182,7 +182,7 @@ class SCGIServer: def __init__(self, wsgiapp, port, interface="localhost", error=sys.stderr, minworkers=2, maxworkers=32, maxrequests=1000, config={}, - reusesocket=None, cpulimit=None): + reusesocket=None, cpulimit=None, timelimit=None): """ @param wsgiapp: is the WSGI application to be run. @type port: int @@ -213,6 +213,10 @@ class SCGIServer: resource limits are available to this platform. After reaching the soft limit workers will continue to process the current request and then cleanly terminate. + @type timelimit: int + @param timelimit: The maximum number of wall clock seconds processing + a request should take. If this is specified, an alarm timer is + installed and the default action is to kill the worker. """ assert hasattr(error, "write") self.wsgiapp = wsgiapp @@ -227,6 +231,7 @@ class SCGIServer: # master: None or a tuple denoting the limit to be configured. # worker: boolean denoting whether the limit is reached. self.cpulimit = cpulimit + self.timelimit = timelimit self.server = None # becomes a socket # maps filedescriptors to WorkerStates self.workers = {} @@ -369,7 +374,11 @@ class SCGIServer: (con, addr) = self.server.accept() # we cannot handle socket.errors here. worksock.sendall('1') # tell server we're working + if self.timelimit: + signal.alarm(self.timelimit) self.process(con) + if self.timelimit: + signal.alarm(0) worksock.sendall('0') # tell server we've finished if self.cpulimit: break -- cgit v1.2.3