From: Chad Horohoe <chadh@wikimedia.org>
Date: Fri, 3 Nov 2017 17:55:09 +0000 (-0700)
Subject: Fix grouping for remaining logger calls in SwiftFileBackend
X-Git-Tag: 1.31.0-rc.0~1611
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=9d49075b38a07b90370da8d49d64d2355ef000b6;p=lhc%2Fweb%2Fwiklou.git

Fix grouping for remaining logger calls in SwiftFileBackend

Change-Id: I80ad8424de3e2a6a0c4b5e69537012a8f775cd68
---

diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php
index e54e8daca6..f50d26b465 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -755,7 +755,8 @@ class SwiftFileBackend extends FileBackendStore {
 			}
 		}
 
-		$this->logger->error( __METHOD__ . ": unable to set SHA-1 metadata for $path" );
+		$this->logger->error( __METHOD__ . ': unable to set SHA-1 metadata for {path}',
+			[ 'path' => $path ] );
 
 		return $objHdrs; // failed
 	}
@@ -1361,7 +1362,8 @@ class SwiftFileBackend extends FileBackendStore {
 
 		if ( $rcode != 204 && $rcode !== 202 ) {
 			$status->fatal( 'backend-fail-internal', $this->name );
-			$this->logger->error( __METHOD__ . ': unexpected rcode value (' . $rcode . ')' );
+			$this->logger->error( __METHOD__ . ': unexpected rcode value ({rcode})',
+				[ 'rcode' => $rcode ] );
 		}
 
 		return $status;
@@ -1772,10 +1774,18 @@ class SwiftFileBackend extends FileBackendStore {
 		if ( $code == 401 ) { // possibly a stale token
 			$this->srvCache->delete( $this->getCredsCacheKey( $this->swiftUser ) );
 		}
-		$this->logger->error(
-			"HTTP $code ($desc) in '{$func}' (given '" . FormatJson::encode( $params ) . "')" .
-			( $err ? ": $err" : "" )
-		);
+		$msg = "HTTP {code} ({desc}) in '{func}' (given '{params}')";
+		$msgParams = [
+			'code'   => $code,
+			'desc'   => $desc,
+			'func'   => $func,
+			'req_params' => FormatJson::encode( $params ),
+		];
+		if ( $err ) {
+			$msg .= ': {err}';
+			$msgParams['err'] = $err;
+		}
+		$this->logger->error( $msg, $msgParams );
 	}
 }