Browse Source

Split the exception handling so install errors don't log as setup errors

More gebuging

Signed-off-by: Joas Schilling <coding@schilljs.com>
tags/v19.0.0beta1
Joas Schilling 4 years ago
parent
commit
fca8f061ab
No account linked to committer's email address
1 changed files with 11 additions and 3 deletions
  1. 11
    3
      lib/private/Setup.php

+ 11
- 3
lib/private/Setup.php View File

@@ -353,11 +353,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(),
@@ -371,6 +369,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…
Cancel
Save