diff --git a/backend/stream_processing/mQTTClientHandler.py b/backend/stream_processing/mQTTClientHandler.py index b9f639d399373e1c9b3b12cffce92bbb353efce6..5d2d022ac3277c1ae86b81406b9cd660b9227d89 100644 --- a/backend/stream_processing/mQTTClientHandler.py +++ b/backend/stream_processing/mQTTClientHandler.py @@ -9,7 +9,6 @@ import os class MQTTClientHandler: - MAPPING_FILE_NAME = os.path.join( os.path.dirname(os.path.abspath(__file__)), "mac_to_room.json" @@ -41,7 +40,6 @@ class MQTTClientHandler: self.logger.info("Connected with result code " + str(rc)) client.subscribe(self.topic) self.logger.info("Subscribed to " + self.topic) - print("Connected with result code " + str(rc) + "\n" + "Subscribed to " + self.topic) # eventuell refactorn und die Aufgaben in Methoden aufteilen def on_message(self, client, userdata, msg): @@ -62,7 +60,6 @@ class MQTTClientHandler: self.logger.warning( f"Neue MAC-Adresse gefunden: {mac}. Mapping wird ergänzt." ) - print(f"Neue MAC-Adresse gefunden: {mac}. Mapping wird ergänzt.") self.mac_to_room[mac] = "" # leerer Platzhalter jsonhandler.write_json(self.mac_to_room, self.MAPPING_FILE_NAME) self.mac_to_room = jsonhandler.load_json(self.MAPPING_FILE_NAME) @@ -88,12 +85,7 @@ class MQTTClientHandler: self.logger.info( f"Wrote to InfluxDB: {msg}" ) - print(f"Token: {self.influx_writer.get_token()}") - print(f"Url: {self.influx_writer.get_url()}") - print(f"Wrote to InfluxDB: {msg}") - print(f"Ping: {self.influx_writer.ping()}") except Exception as e: - print(f"Failed writing to InfluxDb: {e}") self.logger.error(f"Failed writing to InfluxDb: {e}") def start(self): diff --git a/backend/utils/influx.py b/backend/utils/influx.py index 993e2cb04f19269658b272cae2705ea8960e20ba..44fa5c39fac94911d50dd5db03a5e34af74dbb43 100644 --- a/backend/utils/influx.py +++ b/backend/utils/influx.py @@ -5,8 +5,6 @@ from influxdb_client.client.write_api import WriteOptions class InfluxDBHelper: def __init__(self, url: str, token: str, org: str, bucket: str): - self.url = url - self.token = token self.client = InfluxDBClient(url=url, token=token, org=org) self.bucket = bucket self.org = org @@ -28,16 +26,8 @@ class InfluxDBHelper: if timestamp: point.time(timestamp, WritePrecision.NS) self.write_api.write(bucket=self.bucket, org=self.org, record=point) - - - - def get_token(self): - return self.token - - def get_url(self): - return self.url - def ping(self): + def ping(self) -> bool: return self.client.ping() def get_all_data(self):