From 057e9e2b1991f5d67971aa9ac9d2108c474ba156 Mon Sep 17 00:00:00 2001
From: esensar <esarajcic1@etf.unsa.ba>
Date: Mon, 8 Oct 2018 22:48:57 +0200
Subject: [PATCH] Add env variable for MQTT_CLIENT_ID

---
 .env                  | 1 +
 app/celery_builder.py | 2 +-
 config.py             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index d744849..a9e6407 100644
--- a/.env
+++ b/.env
@@ -2,3 +2,4 @@ DATABASE_URL="postgresql://localhost"
 REDIS_URL=redis://localhost:6379
 CELERY_TASK_SERIALIZER=json
 DEBUG=True
+MQTT_CLIENT=local
diff --git a/app/celery_builder.py b/app/celery_builder.py
index 9814f73..a2bf10e 100644
--- a/app/celery_builder.py
+++ b/app/celery_builder.py
@@ -5,6 +5,6 @@ from .tasks.celery_configurator import make_celery
 app = Flask(__name__, instance_relative_config=True)
 app.config.from_object('config')
 app.config.from_pyfile('config.py', silent=True)
-app.config['MQTT_CLIENT_ID'] = 'final-iot-backend-server-worker'
+app.config['MQTT_CLIENT_ID'] = app.config['MQTT_CLIENT_ID'] + '-worker'
 task_builder = make_celery(app)
 task_builder.autodiscover_tasks(['app.devices'])
diff --git a/config.py b/config.py
index f82150f..230b5e0 100644
--- a/config.py
+++ b/config.py
@@ -29,7 +29,7 @@ CSRF_SESSION_KEY = "secret"
 SECRET_KEY = "?['Z(Z\x83Y \x06T\x12\x96<\xff\x12\xe0\x1b\xd1J\xe0\xd9ld"
 
 # MQTT configuration
-MQTT_CLIENT_ID = 'final-iot-backend-server-local2'
+MQTT_CLIENT_ID = 'final-iot-backend-server-' + os.environ['MQTT_CLIENT']
 MQTT_BROKER_URL = 'broker.hivemq.com'
 MQTT_BROKER_PORT = 1883
 MQTT_USERNAME = 'user'