diff --git a/includes/ApiVisualEditor.php b/includes/ApiVisualEditor.php index 696bdeb2d3..def660a534 100644 --- a/includes/ApiVisualEditor.php +++ b/includes/ApiVisualEditor.php @@ -134,16 +134,13 @@ class ApiVisualEditor extends ApiBase { ); } else { // error null, code not 200 + $trace = ( new Exception )->getTraceAsString(); $this->logger->warning( - __METHOD__ . ": Received HTTP {code} from RESTBase", - [ - 'code' => $response['code'], - 'trace' => ( new Exception )->getTraceAsString(), - 'response' => $response['body'], - 'requestPath' => $path, + __METHOD__ . ": Received HTTP {$response['code']} from RESTBase for $path." . + " Trace: {$trace}" . + " Response: {$response['body']}" . /** @phan-suppress-next-line PhanTypeInvalidDimOffset */ - 'requestIfMatch' => $reqheaders['If-Match'] ?? '', - ] + " Request If-Match: {$reqheaders['If-Match']}" ); $this->dieWithError( [ 'apierror-visualeditor-docserver-http', $response['code'] ], diff --git a/includes/ApiVisualEditorEdit.php b/includes/ApiVisualEditorEdit.php index 08d6059674..8f15d00b9b 100644 --- a/includes/ApiVisualEditorEdit.php +++ b/includes/ApiVisualEditorEdit.php @@ -288,11 +288,7 @@ class ApiVisualEditorEdit extends ApiVisualEditor { "?$ /x', $etag ) ) { $this->logger->info( - __METHOD__ . ": Received funny ETag from client: {etag}", - [ - 'etag' => $etag, - 'requestPath' => $path, - ] + __METHOD__ . ": Received funny ETag from client: $etag for $path" ); } return $this->requestRestbase(