etc: Add environment option to run init.d/ashd silently.

[ashd.git] / python3 / scgi-wsgi3

diff --git a/python3/scgi-wsgi3 b/python3/scgi-wsgi3
index 0dfe9a1..a8fccf0 100755 (executable)
--- a/python3/scgi-wsgi3
+++ b/python3/scgi-wsgi3
@@ -3,14 +3,19 @@
 import sys, os, getopt, logging, collections
 import socket
 import ashd.scgi, 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 REQUEST-HANDLER[:PAR[=VAL](,PAR[=VAL])...]] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
 
 sk = None
+hspec = "free", {}
 modwsgi_compat = False
 setlog = True
-opts, args = getopt.getopt(sys.argv[1:], "+hALp:T:")
+opts, args = getopt.getopt(sys.argv[1:], "+hALp:t:T:m:")
 for o, a in opts:
     if o == "-h":
         usage(sys.stdout)
@@ -33,6 +38,11 @@ for o, a in opts:
         sk.listen(32)
     elif o == "-A":
         modwsgi_compat = True
+    elif o == "-m":
+        if pdm is not None:
+            pdm.srv.listen(a)
+    elif o == "-t":
+        hspec = ashd.serve.parsehspec(a)
 if len(args) < 1:
     usage(sys.stderr)
     sys.exit(1)
@@ -88,48 +98,56 @@ def recode(thing):
     else:
         return str(thing).encode("latin-1")
 
-class reqthread(ashd.serve.wsgithread):
-    def __init__(self, sk):
-        super().__init__()
+class request(ashd.serve.wsgirequest):
+    def __init__(self, *, sk, **kw):
+        super().__init__(**kw)
         self.bsk = sk.dup()
         self.sk = self.bsk.makefile("rwb")
 
-    def handlewsgi(self):
-        return handler(self.env, self.startreq)
+    def mkenv(self):
+        return mkenv(ashd.scgi.readhead(self.sk), self.sk)
+
+    def handlewsgi(self, env, startreq):
+        return handler(env, startreq)
+
+    def fileno(self):
+        return self.bsk.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.bsk.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 close(self):
+        self.sk.close()
+        self.bsk.close()
 
-    def run(self):
+if hspec[0] not in ashd.serve.names:
+    sys.stderr.write("scgi-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("scgi-wsgi3: %s\n" % exc)
+    sys.exit(1)
+
+reqhandler = hclass(**hargs)
+try:
+    while True:
+        nsk, addr = sk.accept()
         try:
-            super().run()
+            reqhandler.handle(request(sk=nsk, handler=reqhandler))
         finally:
-            self.sk.close()
-            self.bsk.close()
-
-while True:
-    nsk, addr = sk.accept()
-    try:
-        reqthread(nsk).start()
-    finally:
-        nsk.close()
+            nsk.close()
+finally:
+    reqhandler.close()