From: Tim Starling <tstarling@wikimedia.org>
Date: Fri, 13 Feb 2015 04:56:39 +0000 (+1100)
Subject: Fix spammy "Writes done" debug message
X-Git-Tag: 1.31.0-rc.0~12424
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=88982d4ccf283f15fc2c7e826e7ba815e3398bf2;p=lhc%2Fweb%2Fwiklou.git

Fix spammy "Writes done" debug message

Was broken by I1a8830eaf, which accidentally caused the log message to
be output for every write query, instead of only the first write query.

Change-Id: I4a53914bcb28804ff4c31b4e0418591793d411b6
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 896b621045..538facb56a 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1083,8 +1083,11 @@ abstract class DatabaseBase implements IDatabase {
 
 		$isWriteQuery = $this->isWriteQuery( $sql );
 		if ( $isWriteQuery ) {
+			if ( !$this->mDoneWrites ) {
+				wfDebug( __METHOD__ . ': Writes done: ' .
+					DatabaseBase::generalizeSQL( $sql ) . "\n" );
+			}
 			# Set a flag indicating that writes have been done
-			wfDebug( __METHOD__ . ': Writes done: ' . DatabaseBase::generalizeSQL( $sql ) . "\n" );
 			$this->mDoneWrites = microtime( true );
 		}