colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduced calls for s3-based uploads 

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 {
$storage->put($fullPath, $imageData);
$storage->setVisibility($fullPath, 'public');
$storage->put($fullPath, $imageData, ['visibility' => 'public']);
} catch (Exception $e) {
\Log::error('Error when attempting image upload:' . $e->getMessage());
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);
$storage->put($thumbFilePath, $thumbData);
$storage->setVisibility($thumbFilePath, 'public');
$storage->put($thumbFilePath, $thumbData, ['visibility' => 'public']);
$this->cache->put('images-' . $image->id . '-' . $thumbFilePath, $thumbFilePath, 60 * 60 * 72);