python: Try to shut ashd-wsgi down more nicely upon signal receipt.

[ashd.git] / python3 / ashd-wsgi3

diff --git a/python3/ashd-wsgi3 b/python3/ashd-wsgi3
index 2a8815b..a63362d 100755 (executable)
--- a/python3/ashd-wsgi3
+++ b/python3/ashd-wsgi3
@@ -1,14 +1,14 @@
 #!/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
 try:
     import pdm.srv
 except:
     pdm = None
 
 def usage(out):
-    out.write("usage: ashd-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT] [-t REQUEST-HANDLER[:PAR[=VAL](,PAR[=VAL])...]] 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")
 
 hspec = "free", {}
 modwsgi_compat = False
@@ -25,7 +25,7 @@ for o, a in opts:
     elif o == "-A":
         modwsgi_compat = True
     elif o == "-l":
-        hspec = "free", {"max": int(a), "abort": 10}
+        hspec = "free", {"max": a, "abort": "10"}
     elif o == "-t":
         hspec = ashd.serve.parsehspec(a)
     elif o == "-m":
@@ -197,6 +197,11 @@ 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)