darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-13 08:42:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-02 07:31:13 -07:00
parent 5edf0c7a68
commit 97ee4fe032
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/aws/s3.py
View File

@@ -318,11 +318,17 @@ def get_job_from_s3(service_id, job_id):
while retries < max_retries: while retries < max_retries:
try: try:
obj = get_s3_object(*get_job_location(service_id, job_id)) # TODO
# TODO remove this when we have fully transitioned to the NEW_FILE_LOCATION_STRUCTURE # for transition on optimizing the s3 partition, we have
if obj is None: # to check for the file location using the new way and the
# old way. After this has been on production for a few weeks
# we should remove the check for the old way.
try:
obj = get_s3_object(*get_job_location(service_id, job_id))
return obj.get()["Body"].read().decode("utf-8")
except botocore.exceptions.ClientError:
obj = get_s3_object(*get_old_job_location(service_id, job_id)) obj = get_s3_object(*get_old_job_location(service_id, job_id))
return obj.get()["Body"].read().decode("utf-8") return obj.get()["Body"].read().decode("utf-8")
except botocore.exceptions.ClientError as e: except botocore.exceptions.ClientError as e:
if e.response["Error"]["Code"] in [ if e.response["Error"]["Code"] in [
"Throttling", "Throttling",