Code cleanup and hardening (see also: T234014) of Database-related
lib code in MediaWiki core.
Bug: T233342
Change-Id: I3c968f4f5300374253dc80d99596cac50fbeb59e
(cherry picked from commit
2e11b14455b44b8fcfd528da5efcc214902c2ffb)
'error' => $error,
'sql1line' => mb_substr( str_replace( "\n", "\\n", $sql ), 0, 5 * 1024 ),
'fname' => $fname,
'error' => $error,
'sql1line' => mb_substr( str_replace( "\n", "\\n", $sql ), 0, 5 * 1024 ),
'fname' => $fname,
- 'trace' => ( new RuntimeException() )->getTraceAsString()
+ 'exception' => new RuntimeException()
"Error connecting to {db_server} as user {db_user}: {error}",
$this->getLogContext( [
'error' => $error,
"Error connecting to {db_server} as user {db_user}: {error}",
$this->getLogContext( [
'error' => $error,
- 'trace' => ( new RuntimeException() )->getTraceAsString()
+ 'exception' => new RuntimeException()
if ( preg_match( '/(^|\s)(DISTINCT|JOIN|ON|AS)(\s|$)/i', $name ) !== 0 ) {
$this->queryLogger->warning(
__METHOD__ . ": use of subqueries is not supported this way",
if ( preg_match( '/(^|\s)(DISTINCT|JOIN|ON|AS)(\s|$)/i', $name ) !== 0 ) {
$this->queryLogger->warning(
__METHOD__ . ": use of subqueries is not supported this way",
- [ 'trace' => ( new RuntimeException() )->getTraceAsString() ]
+ [ 'exception' => new RuntimeException() ]
$this->queryLogger->warning(
"$fname: Expected mass snapshot flush of all peer transactions " .
"in the explicit transactions round '{$this->getTransactionRoundId()}'",
$this->queryLogger->warning(
"$fname: Expected mass snapshot flush of all peer transactions " .
"in the explicit transactions round '{$this->getTransactionRoundId()}'",
- [ 'trace' => ( new RuntimeException() )->getTraceAsString() ]
+ [ 'exception' => new RuntimeException() ]
$fname . ': lost connection to {dbserver}; reconnected',
[
'dbserver' => $this->getServer(),
$fname . ': lost connection to {dbserver}; reconnected',
[
'dbserver' => $this->getServer(),
- 'trace' => ( new RuntimeException() )->getTraceAsString()
+ 'exception' => new RuntimeException()
]
);
} catch ( DBConnectionError $e ) {
]
);
} catch ( DBConnectionError $e ) {
public function __clone() {
$this->connLogger->warning(
"Cloning " . static::class . " is not recommended; forking connection",
public function __clone() {
$this->connLogger->warning(
"Cloning " . static::class . " is not recommended; forking connection",
- [ 'trace' => ( new RuntimeException() )->getTraceAsString() ]
+ [ 'exception' => new RuntimeException() ]
);
if ( $this->isOpen() ) {
);
if ( $this->isOpen() ) {
$this->getLogContext( [
'method' => __METHOD__,
'age' => $staleness,
$this->getLogContext( [
'method' => __METHOD__,
'age' => $staleness,
- 'trace' => ( new RuntimeException() )->getTraceAsString()
+ 'exception' => new RuntimeException()