bbs/clrghouz
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Better catching failures when Stream::read doesnt returns null
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 26s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m31s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 8s
Details

Browse Source
This commit is contained in:
Deon George 2024-11-05 21:51:48 +11:00
parent 296740aead
commit b5d2479098
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -20,6 +20,7 @@ QUEUE_CONNECTION=database
SESSION_DRIVER=file SESSION_DRIVER=file
SESSION_LIFETIME=120 SESSION_LIFETIME=120
FILESYSTEM_DISK=s3
AWS_ACCESS_KEY_ID= AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY= AWS_SECRET_ACCESS_KEY=
AWS_BUCKET= AWS_BUCKET=

9
app/Classes/File/File.php
View File

@ -86,11 +86,9 @@ final class File extends Send
$this->size = $this->f->size; $this->size = $this->f->size;
// If sending file is a File::class, then our file is s3 // If sending file is a File::class, then our file is s3
if ($this->nameas && $this->f instanceof FileModel) { $this->fd = ($this->nameas && $this->f instanceof FileModel)
$this->fd = Storage::readStream($this->f->rel_name); ? Storage::readStream($this->f->rel_name)
: fopen($this->full_name,'rb');
} else {
$this->fd = fopen($this->full_name,'rb');
if (! $this->fd) { if (! $this->fd) {
Log::error(sprintf('%s:! Unable to open file [%s] for reading',self::LOGKEY,$this->full_name)); Log::error(sprintf('%s:! Unable to open file [%s] for reading',self::LOGKEY,$this->full_name));
@ -99,7 +97,6 @@ final class File extends Send
} }
Log::info(sprintf('%s:= File [%s] opened with size [%d]',self::LOGKEY,$this->full_name,$this->size)); Log::info(sprintf('%s:= File [%s] opened with size [%d]',self::LOGKEY,$this->full_name,$this->size));
}
return TRUE; return TRUE;
} }