From f720cbd4a47526cc1edd430092441a477ad2252e Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Mon, 18 Oct 2010 19:56:33 +0000
Subject: [PATCH] Make some wfDebug() messages nicer to look at in debug log
 file.

---
 includes/User.php            | 12 ++++++------
 includes/db/LoadBalancer.php |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index 67c284312b..7fc0cce19a 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -248,7 +248,7 @@ class User {
 		}
 
 		if ( !$data ) {
-			wfDebug( "Cache miss for user {$this->mId}\n" );
+			wfDebug( "User: cache miss for user {$this->mId}\n" );
 			# Load from DB
 			if ( !$this->loadFromDatabase() ) {
 				# Can't load from ID, user is anonymous
@@ -256,7 +256,7 @@ class User {
 			}
 			$this->saveToCache();
 		} else {
-			wfDebug( "Got user {$this->mId} from cache\n" );
+			wfDebug( "User: got user {$this->mId} from cache\n" );
 			# Restore from cache
 			foreach ( self::$mCacheVars as $name ) {
 				$this->$name = $data[$name];
@@ -890,11 +890,11 @@ class User {
 
 		if ( ( $sName == $this->mName ) && $passwordCorrect ) {
 			$_SESSION['wsToken'] = $this->mToken;
-			wfDebug( "Logged in from $from\n" );
+			wfDebug( "User: logged in from $from\n" );
 			return true;
 		} else {
 			# Invalid credentials
-			wfDebug( "Can't log in from $from, invalid credentials\n" );
+			wfDebug( "User: can't log in from $from, invalid credentials\n" );
 			$this->loadDefaults();
 			return false;
 		}
@@ -3617,12 +3617,12 @@ class User {
 
 		// Maybe load from the object
 		if ( !is_null( $this->mOptionOverrides ) ) {
-			wfDebug( "Loading options for user " . $this->getId() . " from override cache.\n" );
+			wfDebug( "User: loading options for user " . $this->getId() . " from override cache.\n" );
 			foreach( $this->mOptionOverrides as $key => $value ) {
 				$this->mOptions[$key] = $value;
 			}
 		} else {
-			wfDebug( "Loading options for user " . $this->getId() . " from database.\n" );
+			wfDebug( "User: loading options for user " . $this->getId() . " from database.\n" );
 			// Load from database
 			$dbr = wfGetDB( DB_SLAVE );
 
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 8c9e110346..6c768e92fe 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -647,12 +647,12 @@ class LoadBalancer {
 		$class = 'Database' . ucfirst( $type );
 
 		# Create object
-		wfDebug( "Connecting to $host $dbname...\n" );
+		wfDebug( "Connecting to $host $dbname... " );
 		$db = new $class( $host, $user, $password, $dbname, 1, $flags );
 		if ( $db->isOpen() ) {
-			wfDebug( "Connected\n" );
+			wfDebug( "Connected.\n" );
 		} else {
-			wfDebug( "Failed\n" );
+			wfDebug( "Failed.\n" );
 		}
 		$db->setLBInfo( $server );
 		if ( isset( $server['fakeSlaveLag'] ) ) {
-- 
2.20.1