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 e54e8da..f50d26b 100644 (file)
--- 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 );
        }
 }