FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add extra redirect before DB to stop race condition

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-15 08:49:01 -06:00
parent ab94b76d00
commit 24e5dec271
6 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/Installer/Http/Controllers/InstallerController.php
View File

@@ -98,15 +98,12 @@ class InstallerController extends AppBaseController
}
/**
* Step 2a. Do the config and setup
* Step 2a. Create the .env
*/
public function dbsetup(Request $request)
public function envsetup(Request $request)
{
$log = [];
Log::info('ENV setup', $request->toArray());
Log::info('DB Setup', $request->toArray());
$log[] = 'Creating environment file';
$this->envService->createEnvFile(
$request->input('db_conn'),
$request->input('db_host'),
@@ -116,6 +113,18 @@ class InstallerController extends AppBaseController
$request->input('db_pass')
);
# Needs to redirect so it can load the new .env
Log::info('Redirecting to database setup');
return redirect(route('installer.dbsetup'));
}
/**
* Step 2b. Setup the database
*/
public function dbsetup(Request $request)
{
$log = [];
$log[] = 'Creating database';
$console_out = $this->dbService->setupDB($request->input('db_conn'));

9
modules/Installer/Http/Routes/install.php
View File

@@ -1,12 +1,15 @@
<?php
Route::get('/', 'InstallerController@index')->name('index');
Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
Route::get('/step1', 'InstallerController@step1')->name('step1');
Route::post('/step1', 'InstallerController@step1')->name('step1');
Route::get('/step2', 'InstallerController@step2')->name('step2');
Route::post('/envsetup', 'InstallerController@envsetup')->name('envsetup');
Route::get('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
Route::get('/step3', 'InstallerController@step3')->name('step3');
Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
Route::post('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
Route::get('/complete', 'InstallerController@complete')->name('complete');