diff --git a/api-customer/src/controllers/AuthController.py b/api-customer/src/controllers/AuthController.py index 65ee4362..1d77882c 100644 --- a/api-customer/src/controllers/AuthController.py +++ b/api-customer/src/controllers/AuthController.py @@ -4,6 +4,7 @@ from board_mate.auth import * from flask import jsonify, request from pydantic import StrictStr +from src.models import logger from src.models.AuthData import AuthData @@ -35,7 +36,7 @@ class AuthController: if self._is_logged_in: jsonify({"success" : False, "message" : "Already logged in", "data" : None}), 400 received_data = request.get_json() - print(received_data) + logger.log_info(received_data) with ApiClient(self.config) as client: auth_api = AuthApi(client) @@ -45,9 +46,9 @@ class AuthController: ) response = auth_api.login(auth_request_dto=auth_request) - print("Data:", response.data) - print(response.data["authToken"]) - print(response.data["clientId"]) + logger.log_info(f"Data: {response.data}") + logger.log_info(response.data["authToken"]) + logger.log_info(response.data["clientId"]) self._auth_data.set_token(response.data["authToken"]) self._auth_data.set_client_id(response.data["clientId"]) diff --git a/api-customer/src/controllers/mqtt_forwarder.py b/api-customer/src/controllers/mqtt_forwarder.py index 224dc50e..7ec7d037 100644 --- a/api-customer/src/controllers/mqtt_forwarder.py +++ b/api-customer/src/controllers/mqtt_forwarder.py @@ -3,6 +3,7 @@ from typing import Callable from pymongo import MongoClient +from src.models import logger from src.models.AuthData import AuthData from src.services.mongo_service import MongoService from src.services.mqtt_service import MQTTService @@ -25,6 +26,7 @@ class MQTTForwarder: def forward_handler(topic: str, msg: str): #self.central_broker.publish(dst_topic, msg) data = json.loads(msg) + logger.log_info(f"Forwarding {msg} from {src_topic} to {dst_topic}") self._db_service.insert("telemetry", data) handler(dst_topic, msg) @@ -35,7 +37,9 @@ class MQTTForwarder: def create_forwarder(auth_data : AuthData, local_broker_address : str, local_broker_port : int, - api_broker_address : str, api_broker_port : int) -> tuple[MQTTService, MQTTService, MQTTForwarder]: + api_broker_address : str, api_broker_port : int, + db_service : MongoService + ) -> tuple[MQTTService, MQTTService, MQTTForwarder]: client_id = auth_data.get_client_id() local_broker = MQTTService( @@ -54,7 +58,9 @@ def create_forwarder(auth_data : AuthData, password="hepl", ) - forwarder = MQTTForwarder(client_id, local_broker, api_broker) + forwarder = MQTTForwarder(client_id, local_broker, api_broker, db_service) + + logger.log_info("Brokers started") return local_broker, api_broker, forwarder diff --git a/api-customer/src/models/logger.py b/api-customer/src/models/logger.py new file mode 100644 index 00000000..d441938e --- /dev/null +++ b/api-customer/src/models/logger.py @@ -0,0 +1,2 @@ +def log_info(msg : object): + print(str(msg), flush=True) \ No newline at end of file diff --git a/api-customer/src/services/mongo_service.py b/api-customer/src/services/mongo_service.py index 55743c0e..9a354010 100644 --- a/api-customer/src/services/mongo_service.py +++ b/api-customer/src/services/mongo_service.py @@ -3,6 +3,8 @@ import json from pymongo import MongoClient from pymongo.synchronous.database import Database +from src.models import logger + class MongoService: @@ -16,19 +18,21 @@ class MongoService: def insert(self, collection : str, data : object): try : + logger.log_info(f"Mongo data : {data}") collection = self._db[collection] payload = self._to_document(data) + logger.log_info(f"Formatted data : {payload}") result = collection.insert_one(payload) return result.inserted_id except Exception as e: - print(e) + logger.log_info(e) def find(self, collection: str, field: str, value): try : collection = self._db[collection] return list(collection.find({field: value})) except Exception as e: - print(e) + logger.log_info(e) def _to_document(self, obj): if obj is None or isinstance(obj, (str, int, float, bool)):