paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-29 11:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload: Avoid fetching bucket objects repeatedly.

Browse Source 
This takes of advantage of saving the bucket object on the
UploadBackend class to deduplicate a bunch of redundant code getting
buckets.
This commit is contained in:
Tim Abbott
2020-06-18 16:09:20 -07:00
committed by Tim Abbott
parent 2ef791fc21
commit 5962d1ea14
2 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/transfer.py
View File

@@ -45,9 +45,8 @@ def transfer_message_files_to_s3(processes: int) -> None:
file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "files", attachment.path_id)
try:
with open(file_path, 'rb') as f:
bucket_name = settings.S3_AUTH_UPLOADS_BUCKET
guessed_type = guess_type(attachment.file_name)[0]
upload_image_to_s3(bucket_name, attachment.path_id, guessed_type, attachment.owner, f.read())
upload_image_to_s3(s3backend.uploads_bucket, attachment.path_id, guessed_type, attachment.owner, f.read())
logging.info("Uploaded message file in path %s", file_path)
except FileNotFoundError: # nocoverage
pass