TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor database connection failed error message

Browse Source
This commit is contained in:
jayvirsinh_gohil
2019-12-04 13:02:38 +05:30
parent c8843eb544
commit 338dbb26a1
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/EnvironmentController.php
View File

@ -33,10 +33,14 @@ class EnvironmentController extends Controller
*/ */
public function saveDatabaseEnvironment(DatabaseEnvironmentRequest $request) public function saveDatabaseEnvironment(DatabaseEnvironmentRequest $request)
{ {
Artisan::call('config:clear');
Artisan::call('cache:clear');
$results = $this->EnvironmentManager->saveDatabaseVariables($request); $results = $this->EnvironmentManager->saveDatabaseVariables($request);
if(array_key_exists("success", $results)) { if(array_key_exists("success", $results)) {
Artisan::call('config:clear'); Artisan::call('config:clear');
Artisan::call('cache:clear');
Artisan::call('storage:link'); Artisan::call('storage:link');
Artisan::call('key:generate --force'); Artisan::call('key:generate --force');
Artisan::call('migrate --seed --force'); Artisan::call('migrate --seed --force');

24
app/Space/EnvironmentManager.php
View File

@ -48,19 +48,21 @@ class EnvironmentManager
'DB_USERNAME='.$request->database_username."\n". 'DB_USERNAME='.$request->database_username."\n".
'DB_PASSWORD='.$request->database_password."\n\n"; 'DB_PASSWORD='.$request->database_password."\n\n";
if (! $this->checkDatabaseConnection($request)) { try {
if ($this->checkDatabaseConnection($request)) {
return [ if(\Schema::hasTable('users') ) {
'error' => $this->checkDatabaseConnection($request) return [
]; 'error' => 'database_should_be_empty'
} else { ];
if(\Schema::hasTable('users') ) { }
return [
'error' => 'database_should_be_empty'
];
} }
} catch (Exception $e) {
return [
'error' => $e->getMessage()
];
} }
try { try {
file_put_contents($this->envPath, str_replace( file_put_contents($this->envPath, str_replace(
@ -321,7 +323,7 @@ class EnvironmentManager
return true; return true;
} catch (Exception $e) { } catch (Exception $e) {
return $e->getMessage(); return $e;
} }
} }
} }