associate main service and log analyser (launch analysis with kafka)

Author: Zat-Code

src/kafka_lib.py

@@ -18,8 +18,6 @@ def __init__(self, url, date=None, nb_try_connection=10):
         self.date = date
         self.nb_try_connection = nb_try_connection
 
-
-
         self.init_producer_ok, self.producer = self.init_producer(url)
         self.queue_sender = queue.Queue(2)
 

src/log_analyser/log_analyser.py

@@ -1,6 +1,6 @@
 import os
 from datetime import datetime, timedelta
-from objects.match import Match
+from log_analyser.objects.match import Match
 
 
 class LogAnalyser:
@@ -29,8 +29,8 @@ def run(self):
                     if type in self.actions:
                         self.actions[type](line_split)
 
-        with open("../logs_process/{}.json".format(self.name.split(".")[0]), "w") as file:
-            file.write(self.match.export_json())
+        # with open("../logs_process/{}.json".format(self.name.split(".")[0]), "w") as file:
+        #     file.write(self.match.export_json())
 
 
     def name2datetime(self):
@@ -87,11 +87,11 @@ def convert_timefile_to_datetime(self, time_string):
         return duration
 
 
-for file in os.listdir("../logs"):
-    if file.endswith(".txt"):
-        print(file)
-        la = LogAnalyser('../logs/{}'.format(file), file)
-        la.run()
+# for file in os.listdir("../logs"):
+#     if file.endswith(".txt"):
+#         print(file)
+#         la = LogAnalyser('../logs/{}'.format(file), file)
+#         la.run()
 
 # la = LogAnalyser('../logs/Log-2023-12-22-21-12-32.txt', "Log-2023-12-22-21-12-32.txt")
 # la.run()

src/log_analyser/objects/character.py

@@ -1,4 +1,4 @@
-from objects.object import Object
+from log_analyser.objects.object import Object
 
 
 class Character(Object):
@@ -22,7 +22,7 @@ def add_kill(self, data):
         self.kills.append(data)
 
     def add_death(self, data):
-        self.deads.append(data)
+        self.deaths.append(data)
 
     def add_offensive_assist(self, data):
         self.offensive_assists.append(data)

src/log_analyser/objects/match.py

@@ -1,6 +1,6 @@
-from objects.object import Object
-from objects.round import Round
-from objects.team import Team
+from log_analyser.objects.object import Object
+from log_analyser.objects.round import Round
+from log_analyser.objects.team import Team
 from datetime import datetime
 
 

src/log_analyser/objects/object.py

@@ -55,8 +55,8 @@ def export_json(self):
                 dict_class_final.pop(key)
             else:
                 dict_class_final[key] = self.export_json_recursive(value)
-        return json.dumps(dict_class_final, indent=4, sort_keys=True, default=str)
-
+        # return json.dumps(dict_class_final, indent=4, sort_keys=True, default=str)
+        return json.dumps(dict_class_final, skipkeys=False, ensure_ascii=True, check_circular=True)
     def convert_timefile_to_datetime(self, time_string):
 
 

src/log_analyser/objects/player.py

@@ -1,6 +1,6 @@
 # from src.log_analyser.character import Character
-from objects.object import Object
-from objects.character import Character
+from log_analyser.objects.object import Object
+from log_analyser.objects.character import Character
 
 
 class Player(Object):

src/log_analyser/objects/round.py

@@ -1,5 +1,5 @@
-from objects.object import Object
-from objects.team import Team
+from log_analyser.objects.object import Object
+from log_analyser.objects.team import Team
 
 
 class Round(Object):

src/log_analyser/objects/team.py

@@ -1,5 +1,6 @@
-from objects.object import Object
-from objects.player import Player
+from log_analyser.objects.object import Object
+from log_analyser.objects.player import Player
+
 
 class Team(Object):
 

src/main.py

@@ -2,6 +2,7 @@
 import time
 import sys
 from kafka_lib import ProducerThread, ConsumerThread
+from log_analyser.log_analyser import LogAnalyser
 
 
 class DatastrikePythonProcessing:
@@ -21,7 +22,10 @@ def __init__(self):
     def on_callback_test(self, topic, data):
         print("message receive : ", topic, data)
 
-        self.producer_thread.send("analyse_report", "test")
+        la = LogAnalyser('logs/Log-2023-12-22-21-12-32.txt', "Log-2023-12-22-21-12-32.txt")
+        la.run()
+        a = la.match.export_json()
+        self.producer_thread.send("analyse.report", la.match.export_json())
 
     def run(self):