diff --git a/src/Config.py b/src/Config.py index 2a9abf6..c3dcdfd 100644 --- a/src/Config.py +++ b/src/Config.py @@ -1,6 +1,8 @@ class Config(object): def __init__(self): + self.appName = 'mbm' + self.logFile = '/tmp/mbm.log' self.mqttBrokerHost = '172.16.2.16' self.mqttBrokerPort = 1883 self.mqttLogin = '' diff --git a/src/master.py b/src/master.py index 0251796..d2abb7f 100644 --- a/src/master.py +++ b/src/master.py @@ -9,30 +9,52 @@ import ScanRateConsideringQueueFeeder import datetime import RegisterDatapoint import pickle +import logging + if __name__ == "__main__": + config = Config.Config() + + logger = logging.getLogger(config.appName) + logger.setLevel(logging.DEBUG) + fh = logging.FileHandler(config.logFile) + fh.setLevel(logging.DEBUG) + ch = logging.StreamHandler() + ch.setLevel(logging.ERROR) + formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') + fh.setFormatter(formatter) + ch.setFormatter(formatter) + logger.addHandler(fh) + logger.addHandler(ch) + queue = MyPriorityQueue.MyPriorityQueue() pubQueue = Queue() nf = NotificationForwarder.NotificationForwarder() - config = Config.Config() + logger.debug('infrastructure prepared') + datapoints = None with open(config.registerFile, 'rb') as f: datapoints = pickle.load(f) RegisterDatapoint.checkRegisterList(datapoints, reset=True) + logger.debug('datapoints read') cp = CommunicationProcessor.CommunicationProcessor(config, queue, pubQueue) cp.start() + logger.debug('CommunicationProcessor started') mp = MqttProcessor.MqttProcessor(config, datapoints, queue, pubQueue) nf.register(mp) mp.start() + logger.debug('MqttProcessor started') qf = ScanRateConsideringQueueFeeder.ScanRateConsideringQueueFeeder(config, datapoints, queue) nf.register(qf) qf.start() + logger.debug('ScanRateConsideringQueueFeeder started') cs = CmdServer.CmdServer(config, nf, datapoints) cs.start() + logger.debug('CmdServer started') \ No newline at end of file