Move getting httpd settings from xsetbg.py to xsetbg-wsgi.py

diff --git a/xsetbg-wsgi.py b/xsetbg-wsgi.py
index 869697deb2049f65c6c54907b5532a1f1e8f6dbc..c682d4e4f4428fc8f88c2ea70c923299007d90be 100755 (executable)
--- a/xsetbg-wsgi.py
+++ b/xsetbg-wsgi.py
@@ -13,7 +13,19 @@ 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 = {}

diff --git a/xsetbg.py b/xsetbg.py
index d9472bcc0b032d66fa52da1d5cab499df6c51edd..b932c81340255e486d37d756a749ea38ffec01e2 100755 (executable)
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -11,7 +11,7 @@ __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
 __license__ = "GNU GPL"
 
-__all__ = ['host', 'port', 'change']
+__all__ = ['change']
 
 
 import anydbm
@@ -92,17 +92,6 @@ if xsetbg_conf.has_option("xsetbg", "min_delay"):
 else:
    min_delay = 3600*24 # 24 hours
 
-# httpd settings
-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.")
-
 
 # DB keys
 timestamp_key = "timestamp"