Send messages from failed S3 Echo upload to DLQ

isikhar · web-flow · commit 6ef162a9b48d · 2026-04-24T09:28:05.000+01:00
diff --git a/src/dlstbx/services/s3echo_watcher.py b/src/dlstbx/services/s3echo_watcher.py
@@ -78,11 +78,10 @@ def watch(self, rw, header, message):
             minio_client, bucket_name, dcid, None, None, self.log
         )
         if response_info and response_info["status"] == -1:
-            self.log.error(
+            rw.send_to("failure", message, transaction=txn)
+            raise RuntimeError(
                 f"Upload of the following files to S3 bucket {params['bucket']} reported in error state:\n{pformat(rw.environment['s3echo_upload'])}"
             )
-            rw.send_to("failure", message, transaction=txn)
-            return False
 
         upload_file_list = s3echo_upload_files.keys()
         self.log.debug(f"Full list of files to upload: {pformat(s3echo_upload_files)}")

Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,10 @@ def watch(self, rw, header, message):`
`78`	`78`	`minio_client, bucket_name, dcid, None, None, self.log`
`79`	`79`	`)`
`80`	`80`	`if response_info and response_info["status"] == -1:`
`81`		`- self.log.error(`
	`81`	`+ rw.send_to("failure", message, transaction=txn)`
	`82`	`+ raise RuntimeError(`
`82`	`83`	`f"Upload of the following files to S3 bucket {params['bucket']} reported in error state:\n{pformat(rw.environment['s3echo_upload'])}"`
`83`	`84`	`)`
`84`		`- rw.send_to("failure", message, transaction=txn)`
`85`		`- return False`
`86`	`85`
`87`	`86`	`upload_file_list = s3echo_upload_files.keys()`
`88`	`87`	`self.log.debug(f"Full list of files to upload: {pformat(s3echo_upload_files)}")`