adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-08 08:12:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lock import and increase timeout

Browse Source
This commit is contained in:
Constantin Graf
2024-09-17 22:17:19 +02:00
committed by Constantin Graf
parent 5c6b32d5bb
commit d4e71e7c2c
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Service/Import/ImportService.php
View File

@@ -10,6 +10,7 @@ use App\Service\Import\Importers\ImporterProvider;
use App\Service\Import\Importers\ImportException;
use App\Service\Import\Importers\ReportDto;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
@@ -27,9 +28,16 @@ class ImportService
Storage::disk(config('filesystems.default'))
->put('import/'.Carbon::now()->toDateString().'-'.$organization->getKey().'-'.Str::uuid(), $data);
DB::transaction(function () use (&$importer, &$data, &$timezone) {
$importer->importData($data, $timezone);
});
$lock = Cache::lock('import:'.$organization->getKey(), config('octane.max_execution_time', 60) + 1);
if ($lock->get()) {
DB::transaction(function () use (&$importer, &$data, &$timezone) {
$importer->importData($data, $timezone);
});
$lock->release();
} else {
throw new ImportException('Import is already in progress');
}
return $importer->getReport();
}