Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-08-24 03:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduced calls for s3-based uploads

Browse Source 
Combined the public ACL update into the put operation.
This commit is contained in:
Dan Brown 2021-04-27 20:36:42 +01:00
parent 140aed3586
commit f8cdd6e80d
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Uploads/ImageService.php
View File

@ -106,8 +106,7 @@ class ImageService
} }
try { try {
$storage->put($fullPath, $imageData); $storage->put($fullPath, $imageData, ['visibility' => 'public']);
$storage->setVisibility($fullPath, 'public');
} catch (Exception $e) { } catch (Exception $e) {
\Log::error('Error when attempting image upload:' . $e->getMessage()); \Log::error('Error when attempting image upload:' . $e->getMessage());
throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $fullPath])); throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $fullPath]));
@ -191,8 +190,7 @@ class ImageService
$thumbData = $this->resizeImage($storage->get($imagePath), $width, $height, $keepRatio); $thumbData = $this->resizeImage($storage->get($imagePath), $width, $height, $keepRatio);
$storage->put($thumbFilePath, $thumbData); $storage->put($thumbFilePath, $thumbData, ['visibility' => 'public']);
$storage->setVisibility($thumbFilePath, 'public');
$this->cache->put('images-' . $image->id . '-' . $thumbFilePath, $thumbFilePath, 60 * 60 * 72); $this->cache->put('images-' . $image->id . '-' . $thumbFilePath, $thumbFilePath, 60 * 60 * 72);