brynq-sdk-task-scheduler 4.0.4__tar.gz → 4.0.6__tar.gz

{brynq_sdk_task_scheduler-4.0.4 → brynq_sdk_task_scheduler-4.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_task_scheduler
-Version: 4.0.4
+Version: 4.0.6
 Summary: Code to execute tasks in BrynQ.com with the task scheduler
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_task_scheduler-4.0.4 → brynq_sdk_task_scheduler-4.0.6}/brynq_sdk_task_scheduler/task_scheduler.py

@@ -12,7 +12,6 @@ import requests
 from brynq_sdk_mandrill import MailClient
 from brynq_sdk_functions import Functions
 from brynq_sdk_mysql import MySQL
-from brynq_sdk_elastic import Elastic
 from brynq_sdk_brynq import BrynQ
 import warnings
 import re
@@ -40,13 +39,11 @@ class TaskScheduler:
             # set it into environment variables for reuse in source and target systems
             os.environ['DATA_INTERFACE_ID'] = str(self.data_interface_id)
             self.mysql_enabled = False
-            self.elastic_enabled = False
             print("You're running locally, so your task won't be started in the platform and logs won't be saved")
         else:
             self.started_local = False
             self.customer_db, self.task_id, self.run_id, self.data_interface_id = sys.argv[1:5]
             self.mysql_enabled = True
-            self.elastic_enabled = True
         # If the task is started locally, the parameters should be set locally
 
         print(f"Run ID: {self.run_id}, Data Interface ID: {self.data_interface_id}, Task ID: {self.task_id}, Started Locally: {self.started_local}")
@@ -72,6 +69,12 @@ class TaskScheduler:
             self.mysql_reachable = True
             try:
                 self.mysql = MySQL()
+                # override connection credentials always because they mightve been retrieved from an interface credential
+                self.mysql.host = os.getenv("MYSQL_HOST")
+                self.mysql.user = os.getenv("MYSQL_USER")
+                self.mysql.password = os.getenv("MYSQL_PASSWORD")
+                self.mysql.database = os.getenv("MYSQL_DATABASE")
+                self.mysql.port = 3306 if os.getenv("MYSQL_PORT") is None else int(os.getenv("MYSQL_PORT"))
                 self.mysql.ping()
             except Exception as e:
                 self.mysql_reachable = False
@@ -142,12 +145,11 @@ class TaskScheduler:
 
         return variable
 
-    def write_execution_log(self, message: str, data, loglevel: str = 'INFO', full_extract: bool = False):
+    def write_execution_log(self, message: str, data = None, loglevel: str = 'INFO', full_extract: bool = False):
         """
         Writes messages to the database. Give the message and the level of the log
         :param message: A string with a message for the log
         :param loglevel: You can choose between DEBUG, INFO, ERROR or CRITICAL (DEBUG is most granulated, CRITICAL the less)
-        :param data: Uploaded data by the interface that has to be logged in ElasticSearch, if you have nothing to log, use None
         :param full_extract: If the data is a full load, set this to True. This will prevent the payload from being logged in ElasticSearch
         :return: If writing to the database is successful or not
         """
@@ -370,7 +372,6 @@ class TaskScheduler:
                 MailClient().send_mail(email_to=email_list, subject=subject, content=content, language='EN')
 
     def _save_log_locally(self, payload, system):
-        # system is 'mysql' or 'elastic'
         log_file_path = os.path.join(self.local_log_dir, f'{system}_log_{self.run_id}.json')
         try:
             if os.path.exists(log_file_path):

{brynq_sdk_task_scheduler-4.0.4 → brynq_sdk_task_scheduler-4.0.6}/brynq_sdk_task_scheduler.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-task-scheduler
-Version: 4.0.4
+Version: 4.0.6
 Summary: Code to execute tasks in BrynQ.com with the task scheduler
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_task_scheduler-4.0.4 → brynq_sdk_task_scheduler-4.0.6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_task_scheduler',
-    version='4.0.4',
+    version='4.0.6',
     description='Code to execute tasks in BrynQ.com with the task scheduler',
     long_description='Code to execute tasks in the BrynQ.com platform with the task scheduler',
     author='BrynQ',