bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

trim whitespaces

Browse source
This commit is contained in:
Philipp Holzer 2019-04-13 20:55:47 +02:00
parent fbd056327a
commit e2f69a04b9
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Database/DBA.php
View file

@ -586,10 +586,10 @@ class DBA
$errorno = self::$errorno; $errorno = self::$errorno;
self::$logger->error('DB Error', [ self::$logger->error('DB Error', [
'code' => self::$errorno, 'code' => self::$errorno,
'error ' => self::$error, 'error' => self::$error,
'callstack' => System::callstack(8), '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. // 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 // It doesn't make sense to continue when the database connection was lost
if (self::$in_retrial) { if (self::$in_retrial) {
self::$logger->notice('Giving up retrial because of database error', [ self::$logger->notice('Giving up retrial because of database error', [
'code' => self::$errorno, 'code' => self::$errorno,
'error ' => self::$error, 'error' => self::$error,
]); ]);
} else { } else {
self::$logger->notice('Couldn\'t reconnect after database error', [ self::$logger->notice('Couldn\'t reconnect after database error', [
'code' => self::$errorno, 'code' => self::$errorno,
'error ' => self::$error, 'error' => self::$error,
]); ]);
} }
exit(1); exit(1);
} else { } else {
// We try it again // We try it again
self::$logger->notice('Reconnected after database error', [ self::$logger->notice('Reconnected after database error', [
'code' => self::$errorno, 'code' => self::$errorno,
'error ' => self::$error, 'error' => self::$error,
]); ]);
self::$in_retrial = true; self::$in_retrial = true;
$ret = self::p($sql, $args); $ret = self::p($sql, $args);
@ -683,18 +683,18 @@ class DBA
$errorno = self::$errorno; $errorno = self::$errorno;
self::$logger->error('DB Error', [ self::$logger->error('DB Error', [
'code' => self::$errorno, 'code' => self::$errorno,
'error ' => self::$error, 'error' => self::$error,
'callstack' => System::callstack(8), 'callstack' => System::callstack(8),
'params' => self::replaceParameters($sql, $params), 'params' => self::replaceParameters($sql, $params),
]); ]);
// On a lost connection we simply quit. // On a lost connection we simply quit.
// A reconnect like in self::p could be dangerous with modifications // A reconnect like in self::p could be dangerous with modifications
if ($errorno == 2006) { if ($errorno == 2006) {
self::$logger->error('Giving up because of database error', [ self::$logger->error('Giving up because of database error', [
'code' => self::$errorno, 'code' => self::$errorno,
'error ' => self::$error, 'error' => self::$error,
]); ]);
exit(1); exit(1);
} }