update of all changes in the last week that fine-tuned the behavior of Monitor

[monitor.git] / plc.py

diff --git a/plc.py b/plc.py
index 11d6e6e..783efbc 100644 (file)
--- a/plc.py
+++ b/plc.py
@@ -13,8 +13,7 @@ import logging
 import time
 import traceback
 try:
-       from config import config
-       config = config()
+       import config
        debug = config.debug
 except:
        debug = False
@@ -31,11 +30,11 @@ XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/"
 #       configured, use them, with their auth definitions.
 auth = Auth()
 try:
-       import monitorconfig
-       auth.auth = {'Username' : monitorconfig.API_AUTH_USER,
+       from monitor import config
+       auth.auth = {'Username' : config.API_AUTH_USER,
                     'AuthMethod' : 'password',
-                                'AuthString' : monitorconfig.API_AUTH_PASSWORD}
-       auth.server = monitorconfig.API_SERVER
+                                'AuthString' : config.API_AUTH_PASSWORD}
+       auth.server = config.API_SERVER
 except:
        try:
                import auth