diff --git a/check_results.py b/check_results.py index a4db4b1..147d339 100644 --- a/check_results.py +++ b/check_results.py @@ -1,3 +1,5 @@ +import time + import playwright from playwright.sync_api import sync_playwright @@ -12,9 +14,9 @@ def check_result_page(url): def run(playwright, url): - pixel_2 = playwright.devices['Pixel 2'] browser = playwright.webkit.launch(headless=False) - page = browser.new_page() + page = browser.new_page( + user_agent="Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.87 Mobile Safari/537.36") url_to_check = url.replace("register/", "") print(url_to_check) page.goto(url_to_check) @@ -23,6 +25,7 @@ def run(playwright, url): browser.close() +# need to start at 21h00 if __name__ == '__main__': # get the list db_manager = DataManager() diff --git a/db/DbManager.py b/db/DbManager.py index 9633ab8..529912f 100644 --- a/db/DbManager.py +++ b/db/DbManager.py @@ -21,7 +21,7 @@ class DataManager: pass def get_all_successful_items(self): - doc_ref = self._db.collection(u'2022-02-24') + doc_ref = self._db.collection(u'2022-02-25') return doc_ref.stream() def save(self, result: ReserveResultPojo): diff --git a/main.py b/main.py index 2550114..b8defff 100644 --- a/main.py +++ b/main.py @@ -14,7 +14,7 @@ from db.DbManager import DataManager from pojo.ReserveResultPojo import ReserveResultPojo, PublishType from utils.excel_reader import ExcelHelper from pojo.serial_modem import SerialModem -from utils.logging import init_logger +from utils.AppLogging import init_logger from utils.message_receiver import MessageReceiver BAUDRATE = 115200 diff --git a/requirements.txt b/requirements.txt index e313391..43f3c2f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,6 @@ pika==1.2.0 playwright==1.19.0 pyserial==3.5 python_gsmmodem_new==0.13.0 + +dataclasses~=0.6 +oci~=2.54.1 \ No newline at end of file diff --git a/utils/logging.py b/utils/AppLogging.py similarity index 100% rename from utils/logging.py rename to utils/AppLogging.py diff --git a/utils/LogSender.py b/utils/LogSender.py new file mode 100644 index 0000000..7fe885d --- /dev/null +++ b/utils/LogSender.py @@ -0,0 +1,44 @@ +import datetime +import logging +import sys + +import oci +from oci.loggingingestion import LoggingClient +from oci.loggingingestion.models import PutLogsDetails, LogEntryBatch, LogEntry + +from utils.AppLogging import init_logger + + +class LogSender: + def __init__(self): + self._config = oci.config.from_file("~/.oci/logger_config") + self._identity = oci.identity.IdentityClient(self._config) + self._loggingingestion_client = LoggingClient(self._config) + + def send_log(self, msg: str, subject="appointment", type: str = "INFO"): + log_id = "ocid1.log.oc1.eu-frankfurt-1.amaaaaaacvc3jtia5enufv5jxe6binq4ndaty7pt5mk7uidipfd62ynwdhnq" + response = self._loggingingestion_client.put_logs( + log_id=log_id, + put_logs_details=PutLogsDetails( + specversion="1.0", + log_entry_batches=[ + LogEntryBatch( + entries=[LogEntry( + data=msg, + id=log_id, + time=datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ"))], + source="Appointment", + type=type, + defaultlogentrytime=datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ"), + subject=subject)]) + ) + return response + + +if __name__ == '__main__': + init_logger() + logger = logging.getLogger() + logger.addHandler(logging.StreamHandler(stream=sys.stdout)) + log_sender = LogSender() + response = log_sender.send_log("test2") + print(response) diff --git a/utils/appointment.log b/utils/appointment.log new file mode 100644 index 0000000..e69de29