diff --git a/.config_app.json b/.config_app.json index 5a02d8e0..7d0c8919 100644 --- a/.config_app.json +++ b/.config_app.json @@ -37,7 +37,8 @@ }, "PASS": "$EE_MQTT", "PAYLOADS_CHANNEL": { - "TOPIC": "naeural/payloads" + "TOPIC": "naeural/payloads", + "TARGETED_TOPIC": "naeural/{}/payloads" }, "PORT": "$EE_MQTT_PORT", "QOS": 2, diff --git a/.config_app_cluster.json b/.config_app_cluster.json index fce3f8d2..0c30f32a 100644 --- a/.config_app_cluster.json +++ b/.config_app_cluster.json @@ -37,7 +37,8 @@ }, "PASS": "$EE_MQTT", "PAYLOADS_CHANNEL": { - "TOPIC": "naeural_test/payloads" + "TOPIC": "naeural_test/payloads", + "TARGETED_TOPIC": "naeural_test/{}/payloads" }, "PORT": "$EE_MQTT_PORT", "QOS": 0, diff --git a/extensions/business/dauth/dauth_manager.py b/extensions/business/dauth/dauth_manager.py index 4dc88bbc..42f27ca9 100644 --- a/extensions/business/dauth/dauth_manager.py +++ b/extensions/business/dauth/dauth_manager.py @@ -124,7 +124,9 @@ def on_response(self, method, response): return def process(self): - self._maybe_log_and_save_tracked_requests() + # TODO: this will be re-enabled in the future. + if False: + self._maybe_log_and_save_tracked_requests() return def __get_current_epoch(self): diff --git a/extensions/business/deeploy/deeploy_mixin.py b/extensions/business/deeploy/deeploy_mixin.py index 79558ed8..d9d70cae 100644 --- a/extensions/business/deeploy/deeploy_mixin.py +++ b/extensions/business/deeploy/deeploy_mixin.py @@ -2915,7 +2915,7 @@ def _get_apps_by_escrow_active_jobs(self, sender_escrow, owner, project_id=None) ) continue - if project_id is not None and pipeline.get(NetMonCt.DEEPLOY_SPECS, {}).get(DEEPLOY_KEYS.PROJECT_ID) != project_id: + if project_id is not None and pipeline.get(NetMonCt.DEEPLOY_SPECS.upper(), {}).get(DEEPLOY_KEYS.PROJECT_ID) != project_id: self.Pd(f"Skipping R1FS payload for job {job_id}: project_id mismatch.", color='y') continue diff --git a/extensions/business/mixins/request_tracking_mixin.py b/extensions/business/mixins/request_tracking_mixin.py index 9c6e710f..11f00441 100644 --- a/extensions/business/mixins/request_tracking_mixin.py +++ b/extensions/business/mixins/request_tracking_mixin.py @@ -82,8 +82,6 @@ def _track_response(self, method, response): break except Exception as e: self.P(f"Error tracking response in cstore: {e}", color='r') - if self.__rt_dirty: - self.__rt_save() return def __rt_save(self): diff --git a/ver.py b/ver.py index 461e39d0..1e696423 100644 --- a/ver.py +++ b/ver.py @@ -1 +1 @@ -__VER__ = '2.10.130' +__VER__ = '2.10.140'