From 68a81dfa66254e7176b29854a86efd29b321a0ef Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 18 Feb 2011 13:35:39 +0000 Subject: [PATCH] Split xsetbg.py to xsetbg-wsgi.py to separate the core from the server. git-svn-id: file:///home/phd/archive/SVN/xsetbg/trunk@48 143022c7-580b-0410-bae3-87f2bf5d3141 --- xsetbg-change | 2 ++ xsetbg-ping | 2 -- xsetbg-wsgi.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ xsetbg.py | 60 ++-------------------------------------- 4 files changed, 80 insertions(+), 59 deletions(-) create mode 100755 xsetbg-change delete mode 100755 xsetbg-ping create mode 100755 xsetbg-wsgi.py diff --git a/xsetbg-change b/xsetbg-change new file mode 100755 index 0000000..a9e4cec --- /dev/null +++ b/xsetbg-change @@ -0,0 +1,2 @@ +#! /bin/sh +exec wget -q -Y off -O /dev/null http://localhost:7999/change diff --git a/xsetbg-ping b/xsetbg-ping deleted file mode 100755 index 3c11349..0000000 --- a/xsetbg-ping +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -exec wget -q -Y off -O /dev/null http://localhost:7999/ping diff --git a/xsetbg-wsgi.py b/xsetbg-wsgi.py new file mode 100755 index 0000000..d7815a9 --- /dev/null +++ b/xsetbg-wsgi.py @@ -0,0 +1,75 @@ +#! /usr/bin/env python +"""XSetBg (WSGI version) + +""" + +__version__ = "$Revision$"[11:-2] +__revision__ = "$Id$"[5:-2] +__date__ = "$Date$"[7:-2] + +__author__ = "Oleg Broytman " +__copyright__ = "Copyright (C) 2000-2010 PhiloSoft Design" +__license__ = "GNU GPL" + + +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 import host, port, change as _change + + +def published(func): + func._wsgi_published = True + return func + +@published +def change(force=False): + _change() + +@published +def force(): + _change(force=True) + +@published +def stop(): + QuitWSGIServer._quit_flag = True + + +g = globals().copy() +commands = dict([(name, g[name]) for name in g + if getattr(g[name], '_wsgi_published', False)]) +del g + +class QuitWSGIServer(WSGIServer): + _quit_flag = False + + def serve_forever(self): + 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: + status = '404 Not found' + response_headers = [('Content-type', 'text/plain')] + start_response(status, response_headers) + return ['The command was not found.\n'] + + try: + commands[command]() + except: + status = '500 Error' + response_headers = [('Content-type', 'text/plain')] + start_response(status, response_headers) + return ['Error occured!\n'] + + status = '200 OK' + response_headers = [('Content-type', 'text/plain')] + start_response(status, response_headers) + return ['Ok\n'] + +force() +httpd = make_server(host, port, app, server_class=QuitWSGIServer) +httpd.serve_forever() diff --git a/xsetbg.py b/xsetbg.py index 0d9d646..c0fd295 100755 --- a/xsetbg.py +++ b/xsetbg.py @@ -15,6 +15,8 @@ __author__ = "Oleg Broytman " __copyright__ = "Copyright (C) 2000-2010 PhiloSoft Design" __license__ = "GNU GPL" +__all__ = ['host', 'port', 'change'] + import sys, os from ConfigParser import SafeConfigParser @@ -26,11 +28,6 @@ import subprocess from time import time from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB -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 - def error(error_str, error_code=1): sys.stderr.write("%s: Error: %s\n" % (sys.argv[0], error_str)) @@ -149,12 +146,7 @@ if not images: error("No images found. Abort.") -def published(func): - func._wsgi_published = True - return func - -@published -def ping(force=False): +def change(force=False): # Use the program's file as the lock file: # lock it to prevent two processes run in parallel. lock_file = open("xsetbg.py", 'r') @@ -211,49 +203,3 @@ def ping(force=False): lock_file.close() # Flush and close the global persistent dictionary if global_db: global_db.close() - -@published -def force(): - ping(force=True) - -@published -def stop(): - QuitWSGIServer._quit_flag = True - - -g = globals().copy() -commands = dict([(name, g[name]) for name in g - if getattr(g[name], '_wsgi_published', False)]) -del g - -class QuitWSGIServer(WSGIServer): - _quit_flag = False - - def serve_forever(self): - 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: - status = '404 Not found' - response_headers = [('Content-type', 'text/plain')] - start_response(status, response_headers) - return ['The command was not found.\n'] - - try: - commands[command]() - except: - status = '500 Error' - response_headers = [('Content-type', 'text/plain')] - start_response(status, response_headers) - return ['Error occured!\n'] - - status = '200 OK' - response_headers = [('Content-type', 'text/plain')] - start_response(status, response_headers) - return ['Ok\n'] - -force() -httpd = make_server(host, port, app, server_class=QuitWSGIServer) -httpd.serve_forever() -- 2.39.2