mirror_maker/synapse-s3-storage-provider
1
0
Fork 1
mirror of https://github.com/matrix-org/synapse-s3-storage-provider.git synced 2024-10-23 07:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resolve linting errors

Browse source
This commit is contained in:
Cody Wyatt Neiman 2022-10-30 16:52:01 -04:00
parent 1e2cec3e56
commit d08c2dcf22
No known key found for this signature in database
GPG key ID: 94475C8B94E4698D
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
s3_storage_provider.py
View file

@ -213,10 +213,7 @@ def s3_download_task(s3_client, bucket, key, eargs, deferred, parent_logcontext)
resp = s3_client.get_object(Bucket=bucket, Key=key) resp = s3_client.get_object(Bucket=bucket, Key=key)
except botocore.exceptions.ClientError as e: except botocore.exceptions.ClientError as e:
if e.response["Error"]["Code"] in ( if e.response["Error"]["Code"] in ("404","NoSuchKey",):
"404",
"NoSuchKey",
):
logger.info("Media %s not found in S3", key) logger.info("Media %s not found in S3", key)
reactor.callFromThread(deferred.callback, None) reactor.callFromThread(deferred.callback, None)
return return

7
scripts/s3_media_upload
View file

@ -338,10 +338,7 @@ def run_upload(s3, bucket, sqlite_conn, base_path, eargs, should_delete):
if not check_file_in_s3(s3, bucket, rel_file_path, eargs): if not check_file_in_s3(s3, bucket, rel_file_path, eargs):
try: try:
s3.upload_file( s3.upload_file(
local_path, local_path, bucket, rel_file_path, ExtraArgs=eargs,
bucket,
rel_file_path,
ExtraArgs=eargs,
) )
except Exception as e: except Exception as e:
print("Failed to upload file %s: %s", local_path, e) print("Failed to upload file %s: %s", local_path, e)
@ -572,7 +569,7 @@ def main():
sqlite_conn, sqlite_conn,
args.base_path, args.base_path,
eargs, eargs,
should_delete=args.delete should_delete=args.delete,
) )
return return