Skip to content
Snippets Groups Projects
Commit c6f19dad authored by jkerdreu's avatar jkerdreu
Browse files

Remove the rx_handler attribute for something more pythonic

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/fork@1777 b32b6428-25c9-4566-ad07-03861ab6144f
parent 1714d819
No related branches found
No related tags found
No related merge requests found
......@@ -25,10 +25,10 @@ class MQTTLogger:
def __init__(self,engine):
self.eng = engine
# change xAAL call flow
self.eng.handle_rx_msg = self.parse_msg
self.eng.add_rx_handler(self.parse_msg)
self.cfg = tools.load_cfg_or_die(PACKAGE_NAME)['config']
self.setup()
def setup(self):
""" connect to mqtt server & register xaal dev"""
cfg = self.cfg
......@@ -55,11 +55,7 @@ class MQTTLogger:
topic = '%s/%s' % (base,k)
print("%s = %s" % (topic,msg.body[k]))
self.mqtt.publish(topic,payload=msg.body[k],qos=0,retain=True)
# continue xAAL flow
self.eng.handle_request(msg)
def get_nickname(self,addr):
""" return a nickname for a device """
try:
......@@ -67,13 +63,13 @@ class MQTTLogger:
except KeyError:
nick = None
return nick
def run():
eng = Engine()
eng = Engine()
log = MQTTLogger(eng)
eng.run()
def main():
try:
......
......@@ -12,10 +12,10 @@ class WARP10Logger:
def __init__(self,engine):
self.eng = engine
# change xAAL call flow
self.eng.handle_rx_msg = self.parse_msg
self.eng.add_rx_handler(self.parse_msg)
self.cfg = tools.load_cfg_or_die(PACKAGE_NAME)['config']
self.setup()
def setup(self):
dev = Device("logger.basic")
dev.address = self.cfg['addr']
......@@ -35,15 +35,15 @@ class WARP10Logger:
value = msg.body[k]
code = code +"// %s%s %s\n" % (name,tags,value)
rsp = self.http.request('POST', self.cfg['url'],headers={'X-Warp10-Token':self.cfg['token']},body=code)
# continue xAAL flow
# continue xAAL flow
self.eng.handle_request(msg)
def run():
eng = Engine()
eng = Engine()
log = WARP10Logger(eng)
eng.run()
def main():
try:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment