Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Documented htpipe.
[ashd.git]
/
python3
/
ashd-wsgi3
diff --git
a/python3/ashd-wsgi3
b/python3/ashd-wsgi3
index
a07ac8d
..
fa0b8b5
100755
(executable)
--- a/
python3/ashd-wsgi3
+++ b/
python3/ashd-wsgi3
@@
-1,7
+1,7
@@
#!/usr/bin/python3
#!/usr/bin/python3
-import sys, os, getopt,
threading, socket, logging, time, locale, collections
-import ashd.
proto, ashd.util, ashd.perf, ashd.serve
+import sys, os, getopt,
socket, logging, time, locale, collections, signal
+import ashd.
util, ashd.serve, ashd.htlib
try:
import pdm.srv
except:
try:
import pdm.srv
except:
@@
-13,7
+13,7
@@
def usage(out):
hspec = "free", {}
modwsgi_compat = False
setlog = True
hspec = "free", {}
modwsgi_compat = False
setlog = True
-opts, args = getopt.getopt(sys.argv[1:], "+hALp:t:m:")
+opts, args = getopt.getopt(sys.argv[1:], "+hALp:t:
l:
m:")
for o, a in opts:
if o == "-h":
usage(sys.stdout)
for o, a in opts:
if o == "-h":
usage(sys.stdout)
@@
-24,6
+24,8
@@
for o, a in opts:
setlog = False
elif o == "-A":
modwsgi_compat = True
setlog = False
elif o == "-A":
modwsgi_compat = True
+ elif o == "-l":
+ hspec = "free", {"max": a, "abort": "10"}
elif o == "-t":
hspec = ashd.serve.parsehspec(a)
elif o == "-m":
elif o == "-t":
hspec = ashd.serve.parsehspec(a)
elif o == "-m":
@@
-155,6
+157,7
@@
class request(ashd.serve.wsgirequest):
def __init__(self, *, bkreq, **kw):
super().__init__(**kw)
self.bkreq = bkreq.dup()
def __init__(self, *, bkreq, **kw):
super().__init__(**kw)
self.bkreq = bkreq.dup()
+ self.sendrights = None
def mkenv(self):
return mkenv(self.bkreq)
def mkenv(self):
return mkenv(self.bkreq)
@@
-166,6
+169,13
@@
class request(ashd.serve.wsgirequest):
return self.bkreq.bsk.fileno()
def writehead(self, status, headers):
return self.bkreq.bsk.fileno()
def writehead(self, status, headers):
+ 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:
w = self.buffer.extend
w(b"HTTP/1.1 " + recode(status) + b"\n")
for nm, val in headers:
@@
-174,13
+184,22
@@
class request(ashd.serve.wsgirequest):
def flush(self):
try:
def flush(self):
try:
- ret = self.bkreq.bsk.send(self.buffer, socket.MSG_DONTWAIT)
+ 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 close(self):
self.buffer[:ret] = b""
except IOError:
raise ashd.serve.closed()
def close(self):
- self.bkreq.close()
+ try:
+ self.bkreq.close()
+ finally:
+ if self.sendrights is not None:
+ self.sendrights.close()
def handle(req):
reqhandler.handle(request(bkreq=req, handler=reqhandler))
def handle(req):
reqhandler.handle(request(bkreq=req, handler=reqhandler))
@@
-195,6
+214,11
@@
except ValueError as exc:
sys.stderr.write("ashd-wsgi3: %s\n" % exc)
sys.exit(1)
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)
reqhandler = hclass(**hargs)
try:
ashd.util.serveloop(handle)