brynq-sdk-task-scheduler 1.2.0__tar.gz → 1.2.1__tar.gz

{brynq_sdk_task_scheduler-1.2.0 → brynq_sdk_task_scheduler-1.2.1}/PKG-INFO

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

{brynq_sdk_task_scheduler-1.2.0 → brynq_sdk_task_scheduler-1.2.1}/brynq_sdk/task_scheduler/task_scheduler.py

@@ -29,40 +29,43 @@ class TaskScheduler(BrynQ):
         with level DEBUG not is stored
         """
         super().__init__()
-        self.es = Elastic()
         self.mysql = MySQL()
-        self.email_after_errors = email_after_errors
-        self.customer_db = self.mysql.database
-        self.customer_id = self.mysql.raw_query(f'SELECT id FROM sc.customers WHERE dbname = \'{self.customer_db}\'')[0][0]
-        self.partner_id = os.getenv('PARTNER_ID').lower().replace(' ', '_') if os.getenv('PARTNER_ID') else 'brynq'
-        self.task_id = task_id
-        self.loglevel = loglevel
-        self.started_at = datetime.datetime.now()
-        # If the task is started via the task_scheduler, the following 3 parameters will be passed by the scheduler
-        if len(sys.argv[1:4]) > 0:
-            self.started_local = False
-            self.customer_db, self.task_id, self.run_id = sys.argv[1:4]
-        # If the task is started locally, the parameters should be set locally
-        else:
-            self.started_local = True
-            self.run_id = int(round(time.time() * 100000))
-        print(self.task_id, self.run_id)
-        self.error_count = 0
+        try:
+            self.es = Elastic()
+            self.email_after_errors = email_after_errors
+            self.customer_db = self.mysql.database
+            self.customer_id = self.mysql.raw_query(f'SELECT id FROM sc.customers WHERE dbname = \'{self.customer_db}\'')[0][0]
+            self.partner_id = os.getenv('PARTNER_ID').lower().replace(' ', '_') if os.getenv('PARTNER_ID') else 'brynq'
+            self.task_id = task_id
+            self.loglevel = loglevel
+            self.started_at = datetime.datetime.now()
+            # If the task is started via the task_scheduler, the following 3 parameters will be passed by the scheduler
+            if len(sys.argv[1:4]) > 0:
+                self.started_local = False
+                self.customer_db, self.task_id, self.run_id = sys.argv[1:4]
+            # If the task is started locally, the parameters should be set locally
+            else:
+                self.started_local = True
+                self.run_id = int(round(time.time() * 100000))
+            print(self.task_id, self.run_id)
+            self.error_count = 0
 
-        # Check if the log tables exists in the customer database. If not, create them
-        # Mysql throws a warning when a table already exists. We don't care so we ignore warnings. (not exceptions!)
-        warnings.filterwarnings('ignore')
+            # Check if the log tables exists in the customer database. If not, create them
+            # Mysql throws a warning when a table already exists. We don't care so we ignore warnings. (not exceptions!)
+            warnings.filterwarnings('ignore')
 
-        # Check if the task is started on schedule or manual. store in a variable to use later in the script
-        self.task_manual_started = self.check_if_task_manual_started()
+            # Check if the task is started on schedule or manual. store in a variable to use later in the script
+            self.task_manual_started = self.check_if_task_manual_started()
 
-        # Creates Elasticsearch index and data view if not exists
-        self.es_index = f"task_execution_log_{self.customer_db}_{self.started_at.strftime('%Y_%m')}"
-        self.es.create_index(index_name=self.es_index)
-        self.es.create_data_view(space_name='interfaces', view_name=f'task_execution_log_{self.customer_db}', name=f'Task execution log {self.customer_db}', time_field='started_at')
+            # Creates Elasticsearch index and data view if not exists
+            self.es_index = f"task_execution_log_{self.customer_db}_{self.started_at.strftime('%Y_%m')}"
+            self.es.create_index(index_name=self.es_index)
+            self.es.create_data_view(space_name='interfaces', view_name=f'task_execution_log_{self.customer_db}', name=f'Task execution log {self.customer_db}', time_field='started_at')
 
-        # Start the task and setup the data in the database
-        self.start_task()
+            # Start the task and setup the data in the database
+            self.start_task()
+        except Exception as e:
+            self.error_handling(e)
 
     def __count_keys(self, json_obj):
         if not isinstance(json_obj, dict):
@@ -242,7 +245,7 @@ class TaskScheduler(BrynQ):
             'started_at': datetime.datetime.now().isoformat(),
             'partner_id': self.partner_id,
             'customer_id': self.customer_id,
-            'customer': os.getenv('BRYNQ_CUSTOMER_NAME').lower().replace(' ', '_'),
+            'customer': os.getenv('BRYNQ_SUBDOMAIN').lower().replace(' ', '_'),
             'file_name': file_name,
             'function_name': function_name,
             'line_number': line_number,
@@ -315,7 +318,7 @@ class TaskScheduler(BrynQ):
             'started_at': datetime.datetime.now().isoformat(),
             'partner_id': self.partner_id,
             'customer_id': self.customer_id,
-            'customer': os.getenv('BRYNQ_CUSTOMER_NAME').lower().replace(' ', '_'),
+            'customer': os.getenv('BRYNQ_SUBDOMAIN').lower().replace(' ', '_'),
             'file_name': file_name,
             'function_name': function_name,
             'line_number': line_number,

{brynq_sdk_task_scheduler-1.2.0 → brynq_sdk_task_scheduler-1.2.1}/brynq_sdk_task_scheduler.egg-info/PKG-INFO

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

{brynq_sdk_task_scheduler-1.2.0 → brynq_sdk_task_scheduler-1.2.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='brynq_sdk_task_scheduler',
-    version='1.2.0',
+    version='1.2.1',
     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',