Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Code Issues Releases Activity

wrap into try catch

Browse Source
This commit is contained in:
Benjamin Beganović 2020-11-24 11:52:01 +01:00
parent 242d48cd1a
commit 549fd92671
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Http/Controllers/SetupController.php
View File

@ -53,7 +53,13 @@ class SetupController extends Controller
public function doSetup(StoreSetupRequest $request) public function doSetup(StoreSetupRequest $request)
{ {
$check = SystemHealth::check(false); try {
$check = SystemHealth::check(false);
} catch (\Exception $e) {
info(['message' => $e->getMessage(), 'action' => 'SetupController::doSetup()']);
return response()->json(['message' => $e->getMessage()], 400);
}
if ($check['system_health'] === false) { if ($check['system_health'] === false) {
info($check); info($check);
@ -63,7 +69,7 @@ class SetupController extends Controller
$mail_driver = $request->input('mail_driver'); $mail_driver = $request->input('mail_driver');
if (! $this->failsafeMailCheck($request)) { if (!$this->failsafeMailCheck($request)) {
$mail_driver = 'log'; $mail_driver = 'log';
} }
@ -72,7 +78,7 @@ class SetupController extends Controller
if (substr($url, -1) != '/') { if (substr($url, -1) != '/') {
$url = $url . '/'; $url = $url . '/';
} }
$env_values = [ $env_values = [
'APP_URL' => $url, 'APP_URL' => $url,
'REQUIRE_HTTPS' => $request->input('https') ? 'true' : 'false', 'REQUIRE_HTTPS' => $request->input('https') ? 'true' : 'false',
@ -95,7 +101,7 @@ class SetupController extends Controller
'NINJA_ENVIRONMENT' => 'selfhost', 'NINJA_ENVIRONMENT' => 'selfhost',
'DB_CONNECTION' => 'db-ninja-01', 'DB_CONNECTION' => 'db-ninja-01',
]; ];
try { try {
foreach ($env_values as $property => $value) { foreach ($env_values as $property => $value) {
$this->updateEnvironmentProperty($property, $value); $this->updateEnvironmentProperty($property, $value);
@ -120,7 +126,7 @@ class SetupController extends Controller
} }
VersionCheck::dispatchNow(); VersionCheck::dispatchNow();
$this->buildCache(true); $this->buildCache(true);
return redirect('/'); return redirect('/');
@ -141,13 +147,19 @@ class SetupController extends Controller
*/ */
public function checkDB(CheckDatabaseRequest $request): Response public function checkDB(CheckDatabaseRequest $request): Response
{ {
$status = SystemHealth::dbCheck($request); try {
$status = SystemHealth::dbCheck($request);
if (is_array($status) && $status['success'] === true) { if (is_array($status) && $status['success'] === true) {
return response([], 200); return response([], 200);
}
return response($status, 400);
} catch (\Exception $e) {
info(['message' => $e->getMessage(), 'action' => 'SetupController::checkDB()']);
return response()->json(['message' => $e->getMessage()], 400);
} }
return response($status, 400);
} }
/** /**