From 66be351bd35c120921acc6bc862bc3d46b7d7053 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Fri, 24 Jan 2020 20:46:25 +0800
Subject: [PATCH] Make MQTT key configurable #299

---
 config/services.yaml             | 1 +
 src/Service/MQTTClient.php       | 7 ++++---
 utils/mqtt_sender/mqtt_sender.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/services.yaml b/config/services.yaml
index e7cec9ea..69b75878 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -75,6 +75,7 @@ services:
     App\Service\MQTTClient:
         arguments:
             $redis_client: "@App\\Service\\RedisClientProvider"
+            $key: "mqtt_events"
 
     App\Service\APNSClient:
         arguments:
diff --git a/src/Service/MQTTClient.php b/src/Service/MQTTClient.php
index aa0932a3..c9c7a4f2 100644
--- a/src/Service/MQTTClient.php
+++ b/src/Service/MQTTClient.php
@@ -9,14 +9,15 @@ class MQTTClient
 {
     const PREFIX = 'motolite.control.';
     const RIDER_PREFIX = 'motorider_';
-    const REDIS_KEY = 'events';
 
     // protected $mclient;
     protected $redis;
+    protected $key;
 
-    public function __construct(RedisClientProvider $redis_client)
+    public function __construct(RedisClientProvider $redis_client, $key)
     {
         $this->redis = $redis_client->getRedisClient();
+        $this->key = $key;
     }
 
     public function __destruct()
@@ -29,7 +30,7 @@ class MQTTClient
         // $this->mclient->publish($channel, $message);
 
         $data = $channel . '|' . $message;
-        $this->redis->lpush(self::REDIS_KEY, $data);
+        $this->redis->lpush($this->key, $data);
     }
 
     public function sendEvent(JobOrder $job_order, $payload)
diff --git a/utils/mqtt_sender/mqtt_sender.py b/utils/mqtt_sender/mqtt_sender.py
index a2d0ea8c..f610b3db 100644
--- a/utils/mqtt_sender/mqtt_sender.py
+++ b/utils/mqtt_sender/mqtt_sender.py
@@ -25,7 +25,7 @@ def redis_listen(client, logger):
     r = redis.StrictRedis(host='localhost', port=6379, db=0)
     while 1:
         time.sleep(0)
-        data = r.brpop("events", 10)
+        data = r.brpop("mqtt_events", 10)
         if data:
             info = data[1].split('|')
             logger.info("Channel: " + info[0] + " message: " + info[1])