Use plain-text json instead of bson (DISCE demo hack)

Author: thrau

cpopservice/core/models.py

@@ -1,20 +1,22 @@
 import abc
+import json
 
 import bson
 
 
 class Serializable(abc.ABC):
 
-    def to_bson(self):
+    def to_bson(self) -> bytes:
         raise NotImplementedError
 
 
 class BaseModel(Serializable):
     def __init__(self, params={}):
         self.__dict__ = params
 
-    def to_bson(self):
-        result = bson.dumps(self.__dict__)
+    def to_bson(self) -> bytes:
+        # result = bson.dumps(self.__dict__)
+        result = json.dumps(self.__dict__).encode('UTF-8')
         return result
 
     @classmethod

cpopservice/core/pubsub.py

@@ -1,6 +1,8 @@
 import logging
+from socket import gethostname
 
 import paho.mqtt.client as mqtt
+import paho.mqtt.subscribe as subscribe
 
 from cpopservice import config
 from cpopservice.core.models import Serializable
@@ -32,9 +34,24 @@ def name():
         return 'mqtt'
 
     def __init__(self):
-        self.client = mqtt.Client()
-        self.client.connect(config.BROKER_HOST, config.BROKER_PORT)
+        self.client_id = 'cpop-service-%s' % gethostname()
+        self.client = mqtt.Client(client_id=self.client_id)
+        self.client.connect(config.BROKER_HOST, config.BROKER_PORT, keepalive=30)
 
     def publish_event(self, event: Serializable):
         LOG.debug('publishing message to topic %s: %s', config.MQTT_TOPIC_NAME, event)
         self.client.publish(config.MQTT_TOPIC_NAME, event.to_bson())
+
+
+class CPOPSubscriberMQTT:
+
+    def __init__(self, callback=None):
+        self.callback = callback
+        pass
+
+    def listen(self):
+        subscribe.callback(self.on_message, config.MQTT_TOPIC_NAME, hostname=config.BROKER_HOST,
+                           port=config.BROKER_PORT)
+
+    def on_message(self, client, userdata, message):
+        print(message)