From 9c487e6b403be81f97abdd641a22c0edab299f02 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 1 Nov 2017 11:06:23 -0700 Subject: [PATCH] Fix up replica/pos logging Change-Id: I8670aef4a684c1c7f9bb510e7f2cc1530bdcfed0 --- includes/libs/rdbms/loadbalancer/LoadBalancer.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php index 1be8926bfa..6bb894547c 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php @@ -603,8 +603,8 @@ class LoadBalancer implements ILoadBalancer { if ( $result == -1 || is_null( $result ) ) { // Timed out waiting for replica DB, use master instead $this->replLogger->warning( - __METHOD__ . ": Timed out waiting on {host} pos {$this->mWaitForPos}", - [ 'host' => $server ] + __METHOD__ . ': Timed out waiting on {host} pos {pos}', + [ 'host' => $server, 'pos' => $this->mWaitForPos ] ); $ok = false; } else { @@ -1640,16 +1640,18 @@ class LoadBalancer implements ILoadBalancer { if ( $pos instanceof DBMasterPos ) { $result = $conn->masterPosWait( $pos, $timeout ); if ( $result == -1 || is_null( $result ) ) { - $msg = __METHOD__ . ": Timed out waiting on {$conn->getServer()} pos {$pos}"; - $this->replLogger->warning( "$msg" ); + $msg = __METHOD__ . ': Timed out waiting on {host} pos {pos}'; + $this->replLogger->warning( $msg, + [ 'host' => $conn->getServer(), 'pos' => $pos ] ); $ok = false; } else { - $this->replLogger->info( __METHOD__ . ": Done" ); + $this->replLogger->info( __METHOD__ . ': Done' ); $ok = true; } } else { $ok = false; // something is misconfigured - $this->replLogger->error( "Could not get master pos for {$conn->getServer()}." ); + $this->replLogger->error( 'Could not get master pos for {host}', + [ 'host' => $conn->getServer() ] ); } return $ok; -- 2.20.1