Make PyMSNt.tac pay attention to CONFIG

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@10 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/PyMSNt.tac b/PyMSNt.tac
index e41586a60b5cf9c52a135b83a324e1c2d739e13a..c0381da782e30613345a5ef40a83a26f7bfed30a 100644 (file)
--- a/PyMSNt.tac
+++ b/PyMSNt.tac
@@ -17,6 +17,8 @@ sys.path[0] = os.path.abspath(PATH + "/src/")
 os.chdir(PATH)
 
 # Set up the service
+import config
+config.configFile = CONFIG
 import main
 from twisted.application import service
 application = service.Application("PyMSNt")

diff --git a/src/config.py b/src/config.py
index 6ab37fe6890555cf11a0f6007ec0388d6a7cc235..655eb107bc91898e74337a09c765323599febe4c 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -1,6 +1,8 @@
 # This file contains the default settings for various options.
 # Please edit config.xml instead of this file
 
+configFile = "config.xml"
+
 jid = "msn"
 ip = "127.0.0.1"
 compjid = ""

diff --git a/src/xmlconfig.py b/src/xmlconfig.py
index e461d7ef3fd0fcc4862e587d3fa7f109d95c0b78..5b0131069f364a8699e2cbd41445239bc1a554f0 100644 (file)
--- a/src/xmlconfig.py
+++ b/src/xmlconfig.py
@@ -18,7 +18,7 @@ def invalidError(text):
 
 def reloadConfig():
        # Find out where the config file is
-       configFile = "config.xml"
+       configFile = config.configFile
        if len(sys.argv) == 2:
                configFile = sys.argv[1]