diff --git a/.gitignore b/.gitignore index 4a30a99..8268d66 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ appointment.log utils/*.log .~contact.xlsx /db/sim_infos.xlsx +.env diff --git a/definitions.py b/definitions.py index 291b8bd..ab000d2 100644 --- a/definitions.py +++ b/definitions.py @@ -1,4 +1,9 @@ import os +from dotenv import load_dotenv + +load_dotenv() + +LOG_SOURCE = os.getenv("LOG_SOURCE") BAUDRATE = 115200 diff --git a/logs/LogSender.py b/logs/LogSender.py index 8830483..a463b1f 100644 --- a/logs/LogSender.py +++ b/logs/LogSender.py @@ -6,6 +6,7 @@ import oci from oci.loggingingestion import LoggingClient from oci.loggingingestion.models import PutLogsDetails, LogEntryBatch, LogEntry +import definitions import params from logs.AppLogging import init_logger from pojo import ReserveResultPojo @@ -44,7 +45,7 @@ class LogSender: msg = "{}, email: {}".format(result.message, result.email) self.send_log(msg, type=LOG_APPOINTMENT_ERROR) - def send_log(self, msg: str, source=params.LOG_SOURCE, subject="appointment", type: str = "INFO"): + def send_log(self, msg: str, source=definitions.LOG_SOURCE, subject="appointment", type: str = "INFO"): log_id = "ocid1.log.oc1.eu-frankfurt-1.amaaaaaacvc3jtia5enufv5jxe6binq4ndaty7pt5mk7uidipfd62ynwdhnq" response = self._loggingingestion_client.put_logs( log_id=log_id, diff --git a/params.py b/params.py index d7ae219..cb6d5a1 100644 --- a/params.py +++ b/params.py @@ -2,9 +2,7 @@ import os from db.DbManager import DataManager from logs.LogSender import LogSender -from dotenv import load_dotenv -load_dotenv() MODEM_POOL_PORTS = [ "/dev/tty.usbmodem1431101", "/dev/tty.usbmodem1431103", @@ -24,7 +22,6 @@ MODEM_POOL_PORTS = [ "/dev/tty.usbmodem1431407" ] CARD_POOL_PORT = "/dev/tty.usbmodem1432101" -LOG_SOURCE = os.getenv("LOG_SOURCE") firebase_store_manager = DataManager() oracle_log_sender = LogSender()