add functional dockerfile, cfg and change docker-compose.yaml

add try catch for run in main.py

Author: Zat-Code

.gitignore

@@ -1 +1,3 @@
-.vscode
+.vscode
+__pycache__/
+.idea/

deploy/Dockerfile

@@ -1,26 +1,3 @@
-FROM debian:bullseye
-
-RUN apt-get update -y \
-    && apt-get upgrade -y \
-    && apt-get -y install build-essential \
-        zlib1g-dev \
-        libncurses5-dev \
-        libgdbm-dev \ 
-        libnss3-dev \
-        libssl-dev \
-        libreadline-dev \
-        libffi-dev \
-        libsqlite3-dev \
-        libbz2-dev \
-        wget \
-    && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get purge -y imagemagick imagemagick-6-common 
-
-RUN cd /usr/src \
-    && wget https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tgz \
-    && tar -xzf Python-3.11.0.tgz \
-    && cd Python-3.11.0 \
-    && ./configure --enable-optimizations \
-    && make altinstall
-
-RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.11 1
+FROM python:3.11-bullseye
+ADD requirements.txt /app/requirements.txt
+RUN python3 -m pip install -r /app/requirements.txt

deploy/datastrike_python_processing.cfg

@@ -0,0 +1,3 @@
+[kafka]
+
+url = kafka:9092

deploy/docker-compose.yaml

@@ -20,4 +20,20 @@ services:
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+
+  datastrike-python:
+    image: datastrike/python:latest
+    build:
+      context: .
+      dockerfile: Dockerfile
+
+    command: /bin/bash -c "cd /datastrike-python/ && python3 main.py"
+    volumes:
+      - ../src/:/datastrike-python
+      - ../../map/:/map
+      - type: bind
+        source: datastrike_python_processing.cfg
+        target: /datastrike-python/datastrike_python_processing.cfg
+    depends_on:
+      - kafka

src/datastrike_python_processing.cfg

@@ -0,0 +1,3 @@
+[kafka]
+
+url = localhost:29092

src/main.py

@@ -3,16 +3,24 @@
 import sys
 from kafka_lib import ProducerThread, ConsumerThread
 from log_analyser.log_analyser import LogAnalyser
+import configparser
 
 
 class DatastrikePythonProcessing:
     def __init__(self):
 
         self.running = True
 
-        self.producer_thread = ProducerThread("localhost:29092")
+        self.config = configparser.ConfigParser()
+        self.config.read("datastrike_python_processing.cfg")
+
+
+        self.kafka_url = self.config["kafka"]["url"]
+
+        print(self.kafka_url)
+        self.producer_thread = ProducerThread(self.kafka_url)
 
-        self.consumer_thread = ConsumerThread("localhost:29092")
+        self.consumer_thread = ConsumerThread(self.kafka_url)
         self.consumer_thread.add_topics("analyse", self.on_callback_test)
 
         self.consumer_thread.start()
@@ -28,13 +36,15 @@ def on_callback_test(self, topic, data):
 
         if self.check_txt_extension(fileName):
 
-            la = LogAnalyser(filePath, fileName, teamId)
-            la.run()
-            if la.map != None:
-                self.producer_thread.send("analyse.report", la.map.export_json())
-            else:
-                self.producer_thread.send("analyse.report", {"error": "File txt not correct"})
-
+            try:
+                la = LogAnalyser(filePath, fileName, teamId)
+                la.run()
+                if la.map != None:
+                    self.producer_thread.send("analyse.report", la.map.export_json())
+                else:
+                    self.producer_thread.send("analyse.report", {"error": "File txt not correct"})
+            except Exception as e:
+                self.producer_thread.send("analyse.report", {"error": "{}".format(e)})
         else:
             self.producer_thread.send("analyse.report", {"error": "File extension not correct"})