csctracker-queue-scheduler 24.1.2__tar.gz → 24.2.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/PKG-INFO +1 -1
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/services/queue_service.py +12 -3
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/services/scheduler_service.py +4 -2
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler.egg-info/PKG-INFO +1 -1
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/LICENSE +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/README.md +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/__init__.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/models/__init__.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/models/base_dto.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/models/enums/__init__.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/models/enums/time_unit.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/models/generic_data_dto.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/services/__init__.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/utils/__init__.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler/utils/utils.py +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler.egg-info/SOURCES.txt +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler.egg-info/dependency_links.txt +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler.egg-info/requires.txt +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/csctracker_queue_scheduler.egg-info/top_level.txt +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/setup.cfg +0 -0
- {csctracker-queue-scheduler-24.1.2 → csctracker-queue-scheduler-24.2.1}/setup.py +0 -0
|
@@ -3,8 +3,11 @@ import os
|
|
|
3
3
|
import queue
|
|
4
4
|
import threading
|
|
5
5
|
import time
|
|
6
|
+
import uuid
|
|
6
7
|
from queue import Queue
|
|
7
8
|
|
|
9
|
+
from flask import g
|
|
10
|
+
|
|
8
11
|
from csctracker_queue_scheduler.models.generic_data_dto import GenericDataDTO
|
|
9
12
|
from csctracker_queue_scheduler.utils import Utils
|
|
10
13
|
|
|
@@ -41,7 +44,9 @@ class QueueService:
|
|
|
41
44
|
self.logger.error(f"Error in priority queue: {e}")
|
|
42
45
|
|
|
43
46
|
def __run_job(self, queue, type):
|
|
44
|
-
func_, args_ = queue.get_nowait()
|
|
47
|
+
func_, args_, correlation_id = queue.get_nowait()
|
|
48
|
+
local = threading.current_thread()
|
|
49
|
+
local.__setattr__('correlation_id', correlation_id)
|
|
45
50
|
if func_ is not None:
|
|
46
51
|
if not args_:
|
|
47
52
|
args_ = None
|
|
@@ -80,7 +85,11 @@ class QueueService:
|
|
|
80
85
|
GenericDataDTO(msg=f"Priority queues: {self.priority_queue.qsize()}")]
|
|
81
86
|
|
|
82
87
|
def put(self, func, priority=False, **args):
|
|
88
|
+
try:
|
|
89
|
+
correlation_id = g.correlation_id
|
|
90
|
+
except:
|
|
91
|
+
correlation_id = str(uuid.uuid4())
|
|
83
92
|
if priority:
|
|
84
|
-
self.priority_queue.put((func, args))
|
|
93
|
+
self.priority_queue.put((func, args, correlation_id))
|
|
85
94
|
else:
|
|
86
|
-
self.normal_queue.put((func, args))
|
|
95
|
+
self.normal_queue.put((func, args, correlation_id))
|
|
@@ -45,7 +45,7 @@ class SchedulerService:
|
|
|
45
45
|
def start_scheduled_job(function,
|
|
46
46
|
args=None,
|
|
47
47
|
period=5,
|
|
48
|
-
time_hh_mm=
|
|
48
|
+
time_hh_mm=None,
|
|
49
49
|
time_unit: TimeUnit = TimeUnit.MINUTES):
|
|
50
50
|
if SchedulerService.__queue_service is None:
|
|
51
51
|
SchedulerService.init()
|
|
@@ -69,10 +69,12 @@ class SchedulerService:
|
|
|
69
69
|
elif time_unit == TimeUnit.WEEKS:
|
|
70
70
|
schedule.every(period).weeks.do(SchedulerService.put_in_queue, function, args, True)
|
|
71
71
|
elif time_unit == TimeUnit.DAILY:
|
|
72
|
+
if time_hh_mm is None:
|
|
73
|
+
time_hh_mm = period
|
|
72
74
|
schedule.every().day.at(time_hh_mm).do(SchedulerService.put_in_queue, function, args, True)
|
|
73
75
|
else:
|
|
74
76
|
raise Exception(f"Inválid time unit -> {time_unit}")
|
|
75
|
-
if time_unit !=
|
|
77
|
+
if time_unit != TimeUnit.DAILY:
|
|
76
78
|
SchedulerService.__logger.info(
|
|
77
79
|
f"Job {Utils.get_friendly_method_name(function)}({args if args else ''}) scheduled to run every {period} {time_unit.value}")
|
|
78
80
|
else:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|