From 62eb67626564f881e8151eb27039b4b7f13e3076 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <chadh@wikimedia.org>
Date: Wed, 3 Dec 2014 11:21:03 -0800
Subject: [PATCH] Deprecated $wgProfilePerHost

Change-Id: I2af28cd3083228136789cff5feadd7b16c509e5b
---
 includes/DefaultSettings.php                  |  4 +++-
 includes/profiler/output/ProfilerOutputDb.php | 23 +++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7e237636f5..ca410884a1 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5378,8 +5378,10 @@ $wgProfileCallTree = false;
 
 /**
  * Should application server host be put into profiling table
+ *
+ * @deprecated set $wgProfiler['perhost'] = true instead
  */
-$wgProfilePerHost = false;
+$wgProfilePerHost = null;
 
 /**
  * Host for UDP profiler.
diff --git a/includes/profiler/output/ProfilerOutputDb.php b/includes/profiler/output/ProfilerOutputDb.php
index f988238e93..ab428027e9 100644
--- a/includes/profiler/output/ProfilerOutputDb.php
+++ b/includes/profiler/output/ProfilerOutputDb.php
@@ -28,19 +28,28 @@
  * @since 1.25
  */
 class ProfilerOutputDb extends ProfilerOutput {
+	/** @var bool Whether to store host data with profiling calls */
+	private $perHost = false;
+
+	public function __construct( Profiler $collector, array $params ) {
+		parent::__construct( $collector, $params );
+		global $wgProfilePerHost;
+
+		// Initialize per-host profiling from config, back-compat if available
+		if ( isset( $this->params['perHost'] ) ) {
+			$this->perHost = $this->params['perHost'];
+		} elseif( $wgProfilePerHost ) {
+			$this->perHost = $wgProfilePerHost;
+		}
+	}
+
 	public function canUse() {
 		# Do not log anything if database is readonly (bug 5375)
 		return !wfReadOnly();
 	}
 
 	public function log( array $stats ) {
-		global $wgProfilePerHost;
-
-		if ( $wgProfilePerHost ) {
-			$pfhost = wfHostname();
-		} else {
-			$pfhost = '';
-		}
+		$pfhost = $this->perHost ? wfHostname() : '';
 
 		try {
 			$dbw = wfGetDB( DB_MASTER );
-- 
2.20.1