Split the exception handling so install errors don't log as setup errors
More gebuging Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
b48daab731
commit
6e892c0db6
|
@ -343,11 +343,9 @@ class Setup {
|
|||
|
||||
$this->config->setValues($newConfigValues);
|
||||
|
||||
$dbSetup->initialize($options);
|
||||
try {
|
||||
$dbSetup->initialize($options);
|
||||
$dbSetup->setupDatabase($username);
|
||||
// apply necessary migrations
|
||||
$dbSetup->runMigrations();
|
||||
} catch (\OC\DatabaseSetupException $e) {
|
||||
$error[] = [
|
||||
'error' => $e->getMessage(),
|
||||
|
@ -361,6 +359,16 @@ class Setup {
|
|||
];
|
||||
return $error;
|
||||
}
|
||||
try {
|
||||
// apply necessary migrations
|
||||
$dbSetup->runMigrations();
|
||||
} catch (Exception $e) {
|
||||
$error[] = [
|
||||
'error' => 'Error while trying to initialise the database: ' . $e->getMessage(),
|
||||
'hint' => '',
|
||||
];
|
||||
return $error;
|
||||
}
|
||||
|
||||
//create the user and group
|
||||
$user = null;
|
||||
|
|
Loading…
Reference in New Issue