Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix grouping for remaining logger calls in SwiftFileBackend

Browse source 
Change-Id: I80ad8424de3e2a6a0c4b5e69537012a8f775cd68
This commit is contained in:
Chad Horohoe 2017-11-03 10:55:09 -07:00 committed by BryanDavis
parent 78a207aec3
commit 9d49075b38
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
includes/libs/filebackend/SwiftFileBackend.php
View file

@ -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 );
}
}