import sys, os, getopt, logging, collections
import socket
-import ashd.scgi, ashd.serve
+import ashd.scgi, ashd.perf, ashd.serve
+try:
+ import pdm.srv
+except:
+ pdm = None
def usage(out):
- out.write("usage: scgi-wsgi3 [-hAL] [-p MODPATH] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
+ out.write("usage: scgi-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
sk = None
modwsgi_compat = False
setlog = True
-opts, args = getopt.getopt(sys.argv[1:], "+hALp:T:")
+opts, args = getopt.getopt(sys.argv[1:], "+hALp:T:m:")
for o, a in opts:
if o == "-h":
usage(sys.stdout)
sk.listen(32)
elif o == "-A":
modwsgi_compat = True
+ elif o == "-m":
+ if pdm is not None:
+ pdm.srv.listen(a)
if len(args) < 1:
usage(sys.stderr)
sys.exit(1)
else:
return str(thing).encode("latin-1")
-class reqthread(ashd.serve.wsgithread):
- def __init__(self, sk):
- super().__init__()
- self.bsk = sk.dup()
- self.sk = self.bsk.makefile("rwb")
+reqhandler = ashd.serve.freethread()
+
+class request(ashd.serve.wsgirequest):
+ def __init__(self, *, sk, **kw):
+ super().__init__(**kw)
+ self.sk = sk.dup()
+
+ def mkenv(self):
+ fsk = self.sk.dup().makefile("rwb")
+ try:
+ return mkenv(ashd.scgi.readhead(fsk), fsk)
+ finally:
+ fsk.close()
+
+ def handlewsgi(self, env, startreq):
+ return handler(env, startreq)
- def handlewsgi(self):
- return handler(self.env, self.startreq)
+ def fileno(self):
+ return self.sk.fileno()
def writehead(self, status, headers):
- buf = bytearray()
- buf += b"Status: " + recode(status) + b"\n"
+ w = self.buffer.extend
+ w(b"Status: " + recode(status) + b"\n")
for nm, val in headers:
- buf += recode(nm) + b": " + recode(val) + b"\n"
- buf += b"\n"
- try:
- self.sk.write(buf)
- except IOError:
- raise ashd.serve.closed()
+ w(recode(nm) + b": " + recode(val) + b"\n")
+ w(b"\n")
- def writedata(self, data):
+ def flush(self):
try:
- self.sk.write(data)
- self.sk.flush()
+ ret = self.sk.send(self.buffer, socket.MSG_DONTWAIT)
+ self.buffer[:ret] = b""
except IOError:
raise ashd.serve.closed()
- def handle(self):
- head = ashd.scgi.readhead(self.sk)
- self.env = mkenv(head, self.sk)
- super().handle()
-
- def run(self):
- try:
- super().run()
- finally:
- self.sk.close()
- self.bsk.close()
+ def close(self):
+ self.sk.close()
while True:
nsk, addr = sk.accept()
try:
- reqthread(nsk).start()
+ reqhandler.handle(request(sk=nsk, handler=reqhandler))
finally:
nsk.close()