X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=xsetbg-wsgi.py;h=161a2b5bd5bfaf3187cbc99e3c79a3e654da8e30;hb=1d0a0014b008e5428fb63ed21109f70d39682661;hp=f4b78737100232015282fd358a2b963ca7a49419;hpb=cdffc4b36468a4d72497c25ec4a3bf1f54fe1b3f;p=xsetbg.git diff --git a/xsetbg-wsgi.py b/xsetbg-wsgi.py index f4b7873..161a2b5 100755 --- a/xsetbg-wsgi.py +++ b/xsetbg-wsgi.py @@ -6,37 +6,42 @@ 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") + host = xsetbg_conf.get("httpd", "host") else: - host = 'localhost' + host = 'localhost' if xsetbg_conf.has_option("httpd", "port"): - port = xsetbg_conf.getint("httpd", "port") + port = xsetbg_conf.getint("httpd", "port") else: - error("Config must specify a port to listen. Abort.") + 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,8 +54,9 @@ 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 + command = env['PATH_INFO'][1:] # Remove the leading slash if command not in commands: status = '404 Not found' response_headers = [('Content-type', 'text/plain')] @@ -59,7 +65,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 +76,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()