Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

#11 Kafka topics are now in the format topic.device_id so messages aren't broadcast to all the listeners of the same topic

Browse source
This commit is contained in:
Fabio Manganiello 2017-12-13 01:07:46 +01:00
parent c62a1a2bd3
commit bf49fb8af3
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platypush/__init__.py
View file

@ -163,7 +163,7 @@ def get_default_pusher_backend(config):
def get_device_id(): def get_device_id():
global config global config
return config['device_id'] return config['device_id'] if 'device_id' in config else None
def main(): def main():

4
platypush/backend/__init__.py
View file

@ -1,4 +1,5 @@
import logging import logging
import socket
import platypush import platypush
from threading import Thread from threading import Thread
@ -29,6 +30,7 @@ class Backend(Thread):
self.on_init = on_init self.on_init = on_init
self.on_close = on_close self.on_close = on_close
self.on_error = on_error self.on_error = on_error
self.device_id = platypush.get_device_id() or socket.gethostname()
Thread.__init__(self) Thread.__init__(self)
logging.basicConfig(level=logging.INFO logging.basicConfig(level=logging.INFO
@ -48,7 +50,7 @@ class Backend(Thread):
return # No target return # No target
target = msg.pop('target') target = msg.pop('target')
if target != platypush.get_device_id() and not self.is_local(): if target != self.device_id and not self.is_local():
return # Not for me return # Not for me
if 'action' not in msg: if 'action' not in msg:

12
platypush/backend/kafka/__init__.py
View file

@ -8,7 +8,8 @@ from .. import Backend
class KafkaBackend(Backend): class KafkaBackend(Backend):
def _init(self, server, topic): def _init(self, server, topic):
self.server = server self.server = server
self.topic = topic self.topic_prefix = topic
self.topic = topic + '.' + self.device_id
self.producer = None self.producer = None
def _on_record(self, record): def _on_record(self, record):
@ -27,16 +28,17 @@ class KafkaBackend(Backend):
self.producer = KafkaProducer(bootstrap_servers=self.server) self.producer = KafkaProducer(bootstrap_servers=self.server)
def send_msg(self, msg): def send_msg(self, msg):
if isinstance(msg, dict):
msg = json.dumps(msg)
if isinstance(msg, str): if isinstance(msg, str):
msg = msg.encode('utf-8') msg = json.loads(msg)
if isinstance(msg, dict):
target = msg['target']
msg = json.dumps(msg).encode('utf-8')
if not isinstance(msg, bytes): if not isinstance(msg, bytes):
msg = json.dumps(msg) msg = json.dumps(msg)
raise RuntimeError('Invalid non-JSON message') raise RuntimeError('Invalid non-JSON message')
self._init_producer() self._init_producer()
self.producer.send(self.topic, msg) self.producer.send(self.topic_prefix + '.' + target, msg)
self.producer.flush() self.producer.flush()
def run(self): def run(self):