From 7327784f5b83940f651ea66901ef0938d20b1286 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Wed, 8 Jan 2014 10:13:24 +0400 Subject: [PATCH] Move getting httpd settings from xsetbg.py to xsetbg-wsgi.py --- xsetbg-wsgi.py | 14 +++++++++++++- xsetbg.py | 13 +------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/xsetbg-wsgi.py b/xsetbg-wsgi.py index 869697d..c682d4e 100755 --- 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 d9472bc..b932c81 100755 --- a/xsetbg.py +++ b/xsetbg.py @@ -11,7 +11,7 @@ __author__ = "Oleg Broytman " __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" -- 2.39.2