#!/usr/bin/python3
-import sys, os, getopt, threading, logging, time, locale, collections
-import ashd.proto, ashd.util, ashd.perf, ashd.serve
+import sys, os, getopt, socket, logging, time, locale, collections.abc, signal
+import ashd.util, ashd.serve, ashd.htlib
try:
import pdm.srv
except:
pdm = None
def usage(out):
- out.write("usage: ashd-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT] HANDLER-MODULE [ARGS...]\n")
+ out.write("usage: ashd-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-t REQUEST-HANDLER[:PAR[=VAL](,PAR[=VAL])...]] HANDLER-MODULE [ARGS...]\n")
-reqlimit = 0
+hspec = "free", {}
modwsgi_compat = False
setlog = True
-opts, args = getopt.getopt(sys.argv[1:], "+hALp:l:m:")
+opts, args = getopt.getopt(sys.argv[1:], "+hALp:t:l:m:")
for o, a in opts:
if o == "-h":
usage(sys.stdout)
elif o == "-A":
modwsgi_compat = True
elif o == "-l":
- reqlimit = int(a)
+ hspec = "free", {"max": a, "abort": "10"}
+ elif o == "-t":
+ hspec = ashd.serve.parsehspec(a)
elif o == "-m":
if pdm is not None:
pdm.srv.listen(a)
env["wsgi.run_once"] = False
return env
-if reqlimit != 0:
- guard = ashd.serve.abortlimiter(reqlimit).call
-else:
- guard = lambda fun: fun()
-
def recode(thing):
- if isinstance(thing, collections.ByteString):
+ if isinstance(thing, collections.abc.ByteString):
return thing
else:
return str(thing).encode("latin-1")
-class reqthread(ashd.serve.wsgithread):
- def __init__(self, req):
- super().__init__()
- self.req = req.dup()
+class request(ashd.serve.wsgirequest):
+ def __init__(self, *, bkreq, **kw):
+ super().__init__(**kw)
+ self.bkreq = bkreq.dup()
+ self.sendrights = None
+
+ def mkenv(self):
+ return mkenv(self.bkreq)
+
+ def handlewsgi(self, env, startreq):
+ return handler(env, startreq)
- def handlewsgi(self):
- return handler(self.env, self.startreq)
+ def fileno(self):
+ return self.bkreq.bsk.fileno()
def writehead(self, status, headers):
- buf = bytearray()
- buf += b"HTTP/1.1 " + recode(status) + b"\n"
+ headers = list(headers)
+ for header in headers:
+ nm, val = header
+ if nm.lower() == "x-ash-send-rights":
+ self.sendrights = val
+ headers.remove(header)
+ break
+ w = self.buffer.extend
+ w(b"HTTP/1.1 " + recode(status) + b"\n")
for nm, val in headers:
- buf += recode(nm) + b": " + recode(val) + b"\n"
- buf += b"\n"
- try:
- self.req.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.req.sk.write(data)
- self.req.sk.flush()
+ if self.sendrights is not None:
+ ret = ashd.htlib.sendfd(self.bkreq.bsk.fileno(), self.sendrights.fileno(), self.buffer)
+ self.sendrights.close()
+ self.sendrights = None
+ else:
+ ret = self.bkreq.bsk.send(self.buffer, socket.MSG_DONTWAIT)
+ self.buffer[:ret] = b""
except IOError:
raise ashd.serve.closed()
- def handle(self):
- self.env = mkenv(self.req)
- with ashd.perf.request(self.env) as reqevent:
- super().handle()
- if self.status:
- reqevent.response([self.status, self.headers])
-
- def run(self):
+ def close(self):
try:
- guard(super().run)
+ self.bkreq.close()
finally:
- self.req.close()
- sys.stderr.flush()
-
+ if self.sendrights is not None:
+ self.sendrights.close()
+
def handle(req):
- reqthread(req).start()
+ reqhandler.handle(request(bkreq=req, handler=reqhandler))
-ashd.util.serveloop(handle)
+if hspec[0] not in ashd.serve.names:
+ sys.stderr.write("ashd-wsgi3: no such request handler: %s\n" % hspec[0])
+ sys.exit(1)
+hclass = ashd.serve.names[hspec[0]]
+try:
+ hargs = hclass.parseargs(**hspec[1])
+except ValueError as exc:
+ sys.stderr.write("ashd-wsgi3: %s\n" % exc)
+ sys.exit(1)
+
+def sigterm(sig, frame):
+ socket.fromfd(0, socket.AF_UNIX, socket.SOCK_SEQPACKET).shutdown(socket.SHUT_RDWR) # :P
+for signum in [signal.SIGINT, signal.SIGTERM]:
+ signal.signal(signum, sigterm)
+
+reqhandler = hclass(**hargs)
+try:
+ ashd.util.serveloop(handle)
+finally:
+ reqhandler.close()