From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 10 Dec 2019 23:51:24 +0000 (+0000)
Subject: Merge "rdbms: Log debug message traces as 'exception.trace' instead of 'trace'" into... 
X-Git-Tag: 1.31.6~4
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=e1ceccda7242006d507f5d74ad2e29f94fb62e09;hp=a3a7176b6539f97d4f723aaacc20f0c18a48bc1d;p=lhc%2Fweb%2Fwiklou.git

Merge "rdbms: Log debug message traces as 'exception.trace' instead of 'trace'" into REL1_31
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 2b5aaf59da..ab4ab68827 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2235,7 +2235,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		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() ]
 			);
 
 			return $name;
@@ -3994,7 +3994,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 				$fname . ': lost connection to {dbserver}; reconnected',
 				[
 					'dbserver' => $this->getServer(),
-					'trace' => ( new RuntimeException() )->getTraceAsString()
+					'exception' => new RuntimeException()
 				]
 			);
 		} catch ( DBConnectionError $e ) {
@@ -4510,8 +4510,8 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 	 */
 	public function __clone() {
 		$this->connLogger->warning(
-			"Cloning " . static::class . " is not recomended; forking connection:\n" .
-			( new RuntimeException() )->getTraceAsString()
+			"Cloning " . static::class . " is not recommended; forking connection",
+			[ 'exception' => new RuntimeException() ]
 		);
 
 		if ( $this->isOpen() ) {