withinboredom/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests Projects Releases Wiki Activity

put hook in correct place

Browse source
This commit is contained in:
Robert Landers 2022-07-08 15:43:12 +02:00
parent f6004fe79a
commit e1c33c9680
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/api/s3/api_server.rs
View file

@ -182,8 +182,7 @@ impl ApiHandler for S3ApiServer {
part_number, part_number,
upload_id, upload_id,
} => { } => {
let hook_awaiter = call_hook(garage.clone(), create_put_object_hook(bucket_name, &key, api_key.key_id)); handle_put_part(
let put_awaiter = handle_put_part(
garage, garage,
req, req,
bucket_id, bucket_id,
@ -191,9 +190,7 @@ impl ApiHandler for S3ApiServer {
part_number, part_number,
&upload_id, &upload_id,
content_sha256, content_sha256,
); ).await
let (put_result, _hook_result) = futures::join!(put_awaiter, hook_awaiter);
put_result
} }
Endpoint::CopyObject { key } => { Endpoint::CopyObject { key } => {
handle_copy(garage, &api_key, &req, bucket_id, &key).await handle_copy(garage, &api_key, &req, bucket_id, &key).await
@ -215,7 +212,10 @@ impl ApiHandler for S3ApiServer {
.await .await
} }
Endpoint::PutObject { key } => { Endpoint::PutObject { key } => {
handle_put(garage, req, &bucket, &key, content_sha256).await let hook_awaiter = call_hook(garage.clone(), create_put_object_hook(bucket_name, &key, api_key.key_id));
let put_awaiter = handle_put(garage, req, &bucket, &key, content_sha256);
let (put_result, _hook_result) = futures::join!(put_awaiter, hook_awaiter);
put_result
} }
Endpoint::AbortMultipartUpload { key, upload_id } => { Endpoint::AbortMultipartUpload { key, upload_id } => {
handle_abort_multipart_upload(garage, bucket_id, &key, &upload_id).await handle_abort_multipart_upload(garage, bucket_id, &key, &upload_id).await