From e2f69a04b9048510849c2cb82de2359351b45cc2 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 13 Apr 2019 20:55:47 +0200
Subject: [PATCH] trim whitespaces
---
src/Database/DBA.php | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 3b17ead387..d95548067f 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -586,10 +586,10 @@ class DBA
$errorno = self::$errorno;
self::$logger->error('DB Error', [
- 'code' => self::$errorno,
- 'error ' => self::$error,
+ 'code' => self::$errorno,
+ 'error' => self::$error,
'callstack' => System::callstack(8),
- 'params' => self::replaceParameters($sql, $args),
+ 'params' => self::replaceParameters($sql, $args),
]);
// On a lost connection we try to reconnect - but only once.
@@ -598,21 +598,21 @@ class DBA
// It doesn't make sense to continue when the database connection was lost
if (self::$in_retrial) {
self::$logger->notice('Giving up retrial because of database error', [
- 'code' => self::$errorno,
- 'error ' => self::$error,
+ 'code' => self::$errorno,
+ 'error' => self::$error,
]);
} else {
self::$logger->notice('Couldn\'t reconnect after database error', [
- 'code' => self::$errorno,
- 'error ' => self::$error,
+ 'code' => self::$errorno,
+ 'error' => self::$error,
]);
}
exit(1);
} else {
// We try it again
self::$logger->notice('Reconnected after database error', [
- 'code' => self::$errorno,
- 'error ' => self::$error,
+ 'code' => self::$errorno,
+ 'error' => self::$error,
]);
self::$in_retrial = true;
$ret = self::p($sql, $args);
@@ -683,18 +683,18 @@ class DBA
$errorno = self::$errorno;
self::$logger->error('DB Error', [
- 'code' => self::$errorno,
- 'error ' => self::$error,
+ 'code' => self::$errorno,
+ 'error' => self::$error,
'callstack' => System::callstack(8),
- 'params' => self::replaceParameters($sql, $params),
+ 'params' => self::replaceParameters($sql, $params),
]);
// On a lost connection we simply quit.
// A reconnect like in self::p could be dangerous with modifications
if ($errorno == 2006) {
self::$logger->error('Giving up because of database error', [
- 'code' => self::$errorno,
- 'error ' => self::$error,
+ 'code' => self::$errorno,
+ 'error' => self::$error,
]);
exit(1);
}
--
2.39.5