X-Git-Url: https://git.phdru.name/?p=xsetbg.git;a=blobdiff_plain;f=xsetbg-wsgi.py;h=f4b78737100232015282fd358a2b963ca7a49419;hp=92d125395c58c051f6c808fc797ea637ecc41d1d;hb=HEAD;hpb=1b9123d0da1cd7fd65ce8d8f45014efea2448c99 diff --git a/xsetbg-wsgi.py b/xsetbg-wsgi.py index 92d1253..aad53ee 100755 --- a/xsetbg-wsgi.py +++ b/xsetbg-wsgi.py @@ -1,16 +1,18 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 """XSetBg (WSGI version) """ +import sys from wsgiref import simple_server from wsgiref.handlers import SimpleHandler from wsgiref.simple_server import WSGIServer, make_server -simple_server.ServerHandler = SimpleHandler # Stop logging to stdout from xsetbg_conf import xsetbg_conf from xsetbg import change as _change +simple_server.ServerHandler = SimpleHandler # Stop logging to stdout + # get httpd settings from config if xsetbg_conf.has_option("httpd", "host"): host = xsetbg_conf.get("httpd", "host") @@ -20,23 +22,29 @@ else: if xsetbg_conf.has_option("httpd", "port"): port = xsetbg_conf.getint("httpd", "port") else: + def error(error_str): + sys.exit("%s: Error: %s\n" % (sys.argv[0], error_str)) error("Config must specify a port to listen. Abort.") commands = {} + def published(func): commands[func.__name__] = func return func + @published def change(force=False): _change() + @published def force(): _change(force=True) + @published def stop(): QuitWSGIServer._quit_flag = True @@ -49,6 +57,7 @@ class QuitWSGIServer(WSGIServer): while not self._quit_flag: self.handle_request() + def app(env, start_response): command = env['PATH_INFO'][1:] # Remove the leading slash if command not in commands: @@ -59,7 +68,7 @@ def app(env, start_response): try: commands[command]() - except: + except Exception: status = '500 Error' response_headers = [('Content-type', 'text/plain')] start_response(status, response_headers) @@ -70,6 +79,7 @@ def app(env, start_response): start_response(status, response_headers) return ['Ok\n'] + force() httpd = make_server(host, port, app, server_class=QuitWSGIServer) httpd.serve_forever()