diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-17 15:21:56 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2018-01-23 10:57:21 +0100 |
| commit | 2a38605545e26ce68a37e5ebb877fd9c9875a37d (patch) | |
| tree | a149433f3fdeae3b4615061b495e4c523328a9a6 /lib/private/Setup | |
| parent | 520f2fd6ea3661d5d49517c7265dd8d7515036ac (diff) | |
| download | nextcloud-server-2a38605545e26ce68a37e5ebb877fd9c9875a37d.tar.gz nextcloud-server-2a38605545e26ce68a37e5ebb877fd9c9875a37d.zip | |
Properly log the full exception instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/Setup')
| -rw-r--r-- | lib/private/Setup/MySQL.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index 30163f03659..9d80bd49aed 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -68,9 +68,10 @@ class MySQL extends AbstractDatabase { $query = "CREATE DATABASE IF NOT EXISTS `$name` CHARACTER SET $characterSet COLLATE ${characterSet}_bin;"; $connection->executeUpdate($query); } catch (\Exception $ex) { - $this->logger->error('Database creation failed: {error}', [ + $this->logger->logException($ex, [ + 'message' => 'Database creation failed.', + 'level' => \OCP\Util::ERROR, 'app' => 'mysql.setup', - 'error' => $ex->getMessage() ]); return; } @@ -80,9 +81,10 @@ class MySQL extends AbstractDatabase { $query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'"; $connection->executeUpdate($query); } catch (\Exception $ex) { - $this->logger->debug('Could not automatically grant privileges, this can be ignored if database user already had privileges: {error}', [ + $this->logger->logException($ex, [ + 'message' => 'Could not automatically grant privileges, this can be ignored if database user already had privileges.', + 'level' => \OCP\Util::DEBUG, 'app' => 'mysql.setup', - 'error' => $ex->getMessage() ]); } } @@ -103,10 +105,11 @@ class MySQL extends AbstractDatabase { $connection->executeUpdate($query); } catch (\Exception $ex){ - $this->logger->error('Database User creation failed: {error}', [ - 'app' => 'mysql.setup', - 'error' => $ex->getMessage() - ]); + $this->logger->logException($ex, [ + 'message' => 'Database user creation failed.', + 'level' => \OCP\Util::ERROR, + 'app' => 'mysql.setup', + ]); } } @@ -157,9 +160,10 @@ class MySQL extends AbstractDatabase { }; } } catch (\Exception $ex) { - $this->logger->info('Can not create a new MySQL user, will continue with the provided user: {error}', [ + $this->logger->logException($ex, [ + 'message' => 'Can not create a new MySQL user, will continue with the provided user.', + 'level' => \OCP\Util::INFO, 'app' => 'mysql.setup', - 'error' => $ex->getMessage() ]); } |