Merge pull request #75 from giovannicuriel/update-versions

Update versions, fixing producer for dojot.tenancy
dojot · Mar 13, 2019 · d893754 · d893754
2 parents 9f64080 + 093e442
commit d893754
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 29 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,13 +11,13 @@ RUN python3 -m venv /usr/src/venv
 ENV VIRTUAL_ENV="/usr/src/venv"
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-ADD . /usr/src/app
+COPY ./requirements/requirements.txt ./requirements
 RUN pip install -r requirements/requirements.txt
 
 FROM python:3.6-alpine
 
 COPY --from=basis /usr/src/venv /usr/src/venv
-COPY --from=basis /usr/src/app /usr/src/app
+COPY . /usr/src/app
 
 RUN apk update && apk --no-cache add libpq libstdc++
 

diff --git a/auth/conf.py b/auth/conf.py
@@ -88,6 +88,10 @@
 # Global subject to use when publishing tenancy lifecycle events
 kafka_subject = 'dojot.tenancy'
 
+
+dojot_management_tenant = os.environ.get('DOJOT_MANAGEMENT_TENANT', "dojot-management")
+dojot_management_user = os.environ.get('DOJOT_MANAGEMENT_USER', "auth")
+
 # Kafka topic (subject) manager
 data_broker_host =  os.environ.get("DATA_BROKER_URL", 'http://data-broker')
 

diff --git a/auth/controller/KafkaPublisher.py b/auth/controller/KafkaPublisher.py
@@ -2,7 +2,7 @@
 import requests
 import logging
 import json
-from conf import kafka_subject, kafka_host, data_broker_host
+from conf import kafka_subject, kafka_host, data_broker_host, dojot_management_tenant
 from dojot.module import Messenger, Config, Log
 import threading
 import time
@@ -32,29 +32,6 @@ def init(cls):
 
         LOGGER.debug("Initializing dojot.module")
         config = Config({
-            "kafka" : {
-                "producer": {
-                    "client.id": "dojot.auth",
-                    "metadata.broker.list": kafka_host,
-                    "compression.codec": "gzip",
-                    "retry.backoff.ms": 200,
-                    "message.send.max.retries": 10,
-                    "socket.keepalive.enable": True,
-                    "queue.buffering.max.messages": 100000,
-                    "queue.buffering.max.ms": 1000,
-                    "batch.num.messages": 1000000,
-                    "dr_cb": True
-                },
-                "consumer": {
-                    "group.id": "dojot.auth",
-                    "metadata.broker.list": kafka_host
-                }
-            },
-            "data_broker" : {
-                "url": data_broker_host,
-                "connection_retries": 3,
-                "timeout_sleep": 5
-            },
             "auth" : {
                 "url": "http://localhost:5000",
                 "connection_retries": 3,
@@ -64,11 +41,16 @@ def init(cls):
 
         LOGGER.debug("Config is:  " + json.dumps(config.auth))
         cls.messenger = Messenger("dojot.auth", config)
+        LOGGER.debug(f"Creating tenant {dojot_management_tenant}...")
+        LOGGER.debug(f"Current tenants are: {cls.messenger.tenants}.")
+        cls.messenger.process_new_tenant(dojot_management_tenant, json.dumps({"tenant" : dojot_management_tenant}))
+        LOGGER.debug("... tenant created.")
+        LOGGER.debug("Creating channel " + kafka_subject)
+        cls.messenger.create_channel(kafka_subject, "w")
+        LOGGER.debug("... channel created.")
         LOGGER.debug("Initializing messenger")
         cls.messenger.init()
         LOGGER.debug("... messenger initialized.")
-        LOGGER.debug("Creating channel " + kafka_subject)
-        cls.messenger.create_channel(kafka_subject, "w")
 
     def run(self):
         self.init()
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -11,4 +11,4 @@ json-logging-py==0.2
 flask-redis==0.3.0
 marisa_trie==0.7.4
 git+https://github.com/dojot/alarm-client-python.git#egg=dojot-alarmlibrary
-dojot.module==0.0.1a1
+dojot.module==0.0.1a4