import time
import traceback
try:
- from config import config
- config = config()
+ import config
debug = config.debug
except:
debug = False
# configured, use them, with their auth definitions.
auth = Auth()
try:
- import monitorconfig
- auth.auth = monitorconfig.API_AUTH
- auth.server = monitorconfig.API_SERVER
+ from monitor import config
+ auth.auth = {'Username' : config.API_AUTH_USER,
+ 'AuthMethod' : 'password',
+ 'AuthString' : config.API_AUTH_PASSWORD}
+ auth.server = config.API_SERVER
except:
try:
import auth
auth.server = auth.plc
except:
+ auth = Auth()
auth.server = XMLRPC_SERVER
api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
return xmlrpclib.Server(url, verbose=False, allow_none=True)
def getAuthAPI():
- return PLC(monitorconfig.API_AUTH, monitorconfig.API_SERVER)
+ return PLC(auth.auth, auth.server)
'''
Returns list of nodes in dbg as reported by PLC