deltafi 2.6.1__tar.gz → 2.7.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.
Potentially problematic release.
This version of deltafi might be problematic. Click here for more details.
- {deltafi-2.6.1 → deltafi-2.7.1}/PKG-INFO +1 -1
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/actioneventqueue.py +6 -2
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/plugin.py +2 -1
- {deltafi-2.6.1 → deltafi-2.7.1}/pyproject.toml +1 -1
- {deltafi-2.6.1 → deltafi-2.7.1}/README.md +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/__init__.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/action.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/actiontype.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/domain.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/exception.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/genericmodel.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/input.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/logger.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/metric.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/result.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/storage.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/test_kit/__init__.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/test_kit/assertions.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/test_kit/compare_helpers.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/test_kit/constants.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/test_kit/egress.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/test_kit/framework.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/test_kit/timed_ingress.py +0 -0
- {deltafi-2.6.1 → deltafi-2.7.1}/deltafi/test_kit/transform.py +0 -0
|
@@ -28,7 +28,7 @@ LONG_RUNNING_TASKS_HASH = "org.deltafi.action-queue.long-running-tasks"
|
|
|
28
28
|
|
|
29
29
|
|
|
30
30
|
class ActionEventQueue:
|
|
31
|
-
def __init__(self, url, max_connections, password):
|
|
31
|
+
def __init__(self, url, max_connections, password, app_name):
|
|
32
32
|
parsed = urlparse(url)
|
|
33
33
|
self.pool = redis.ConnectionPool(
|
|
34
34
|
max_connections=max_connections,
|
|
@@ -36,6 +36,7 @@ class ActionEventQueue:
|
|
|
36
36
|
port=parsed.port,
|
|
37
37
|
password=password)
|
|
38
38
|
self.connection = None
|
|
39
|
+
self.app_name = app_name
|
|
39
40
|
|
|
40
41
|
def get_connection(self):
|
|
41
42
|
if self.connection is None:
|
|
@@ -68,7 +69,10 @@ class ActionEventQueue:
|
|
|
68
69
|
key = action_execution.key
|
|
69
70
|
start_time = action_execution.start_time.isoformat().replace("+00:00", "Z")
|
|
70
71
|
heartbeat_time = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
|
|
71
|
-
|
|
72
|
+
values = [start_time, heartbeat_time]
|
|
73
|
+
if self.app_name is not None:
|
|
74
|
+
values.append(self.app_name)
|
|
75
|
+
value = json.dumps(values)
|
|
72
76
|
conn = self.get_connection()
|
|
73
77
|
conn.hset(LONG_RUNNING_TASKS_HASH, key, value)
|
|
74
78
|
except Exception as e:
|
|
@@ -118,7 +118,8 @@ def _find_variables_filename(names: List[str]):
|
|
|
118
118
|
def _setup_queue(max_connections):
|
|
119
119
|
url = os.getenv('VALKEY_URL', 'http://deltafi-valkey-master:6379')
|
|
120
120
|
password = os.getenv('VALKEY_PASSWORD')
|
|
121
|
-
|
|
121
|
+
app_name = os.getenv('APP_NAME')
|
|
122
|
+
return ActionEventQueue(url, max_connections, password, app_name)
|
|
122
123
|
|
|
123
124
|
|
|
124
125
|
def _setup_content_service():
|
|
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
|
|
File without changes
|
|
File without changes
|
|
File without changes
|