#!/usr/bin/python
import sys, os, getopt, threading
-import ashd.proto
+import ashd.proto, ashd.util
def usage(out):
out.write("usage: ashd-wsgi [-hA] [-p MODPATH] HANDLER-MODULE [ARGS...]\n")
if not hasattr(handlermod, "wmain"):
sys.stderr.write("ashd-wsgi: handler %s has no `wmain' function\n" % args[0])
sys.exit(1)
- handler = handlermod.wmain(args[1:])
+ handler = handlermod.wmain(*args[1:])
else:
if not hasattr(handlermod, "application"):
sys.stderr.write("ashd-wsgi: handler %s has no `application' object\n" % args[0])
sys.exit(1)
handler = handlermod.application
+cwd = os.getcwd()
+def absolutify(path):
+ if path[0] != '/':
+ return os.path.join(cwd, path)
+ return path
+
def dowsgi(req):
env = {}
env["wsgi.version"] = 1, 0
name = req.url
p = name.find('?')
if p >= 0:
- name = name[:p]
env["QUERY_STRING"] = name[p + 1:]
+ name = name[:p]
else:
env["QUERY_STRING"] = ""
if name[-len(req.rest):] == req.rest:
if "X-Ash-Address" in req: env["REMOTE_ADDR"] = req["X-Ash-Address"]
if "Content-Type" in req: env["CONTENT_TYPE"] = req["Content-Type"]
if "Content-Length" in req: env["CONTENT_LENGTH"] = req["Content-Length"]
- if "X-Ash-File" in req: env["SCRIPT_FILENAME"] = req["X-Ash-File"]
+ if "X-Ash-File" in req: env["SCRIPT_FILENAME"] = absolutify(req["X-Ash-File"])
if "X-Ash-Protocol" in req: env["wsgi.url_scheme"] = req["X-Ash-Protocol"]
env["wsgi.input"] = req.sk
env["wsgi.errors"] = sys.stderr
resp = []
respsent = []
- def write(data):
- if not data:
- return
+ def flushreq():
if not respsent:
if not resp:
raise Exception, "Trying to write data before starting response."
for nm, val in headers:
req.sk.write("%s: %s\n" % (nm, val))
req.sk.write("\n")
+
+ def write(data):
+ if not data:
+ return
+ flushreq()
req.sk.write(data)
req.sk.flush()
try:
for data in respiter:
write(data)
- write("")
+ if resp:
+ flushreq()
finally:
if hasattr(respiter, "close"):
respiter.close()
def handle(req):
reqthread(req).start()
-ashd.proto.serveloop(handle)
+ashd.util.serveloop(handle)