From 3ffa3534a02bfd57b8ac113dddfab6933354448e Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 5 Apr 2021 21:47:57 -0700 Subject: [PATCH] Use environmental variables in memory limits Signed-off-by: snipe --- app/Console/Commands/ObjectImportCommand.php | 4 ++-- app/Http/Controllers/ReportsController.php | 2 +- app/Http/Requests/ItemImportRequest.php | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php index 3325a0c65d..71c974a21d 100644 --- a/app/Console/Commands/ObjectImportCommand.php +++ b/app/Console/Commands/ObjectImportCommand.php @@ -5,8 +5,8 @@ use Illuminate\Console\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; -ini_set('max_execution_time', 600); //600 seconds = 10 minutes -ini_set('memory_limit', '500M'); +ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes +ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M')); /** * Class ObjectImportCommand diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 4b85b1def6..3b55e43a02 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -403,7 +403,7 @@ class ReportsController extends Controller */ public function postCustom(Request $request) { - ini_set('max_execution_time', 12000); + ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); //12000 seconds = 200 minutes $this->authorize('reports.view'); diff --git a/app/Http/Requests/ItemImportRequest.php b/app/Http/Requests/ItemImportRequest.php index e48c82bd90..b9c12d3459 100644 --- a/app/Http/Requests/ItemImportRequest.php +++ b/app/Http/Requests/ItemImportRequest.php @@ -32,8 +32,9 @@ class ItemImportRequest extends FormRequest public function import(Import $import) { - ini_set('max_execution_time', 600); //600 seconds = 10 minutes - ini_set('memory_limit', '500M'); + ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes + ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M')); + $filename = config('app.private_uploads') . '/imports/' . $import->file_path; $import->import_type = $this->input('import-type'); $class = title_case($import->import_type);