Convert print_all.py

[xsetbg.git] / xsetbg-wsgi.py

diff --git a/xsetbg-wsgi.py b/xsetbg-wsgi.py
index c90da9258c13df1d2c7b7001c2c1ee389182f1a5..c682d4e4f4428fc8f88c2ea70c923299007d90be 100755 (executable)
--- a/xsetbg-wsgi.py
+++ b/xsetbg-wsgi.py
@@ -3,12 +3,8 @@
 
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
@@ -17,11 +13,25 @@ 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
+from xsetbg_conf import xsetbg_conf
+from xsetbg import change as _change
+
+# get httpd settings from config
+if xsetbg_conf.has_option("httpd", "host"):
+   host = xsetbg_conf.get("httpd", "host")
+else:
+   host = 'localhost'
+
+if xsetbg_conf.has_option("httpd", "port"):
+   port = xsetbg_conf.getint("httpd", "port")
+else:
+   error("Config must specify a port to listen. Abort.")
 
 
+commands = {}
+
 def published(func):
-    func._wsgi_published = True
+    commands[func.__name__] = func
     return func
 
 @published
@@ -37,11 +47,6 @@ 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