database/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-09-02 12:41:14 +03:00
Code Activity

Improve S3 error reporting.

Browse Source
This commit is contained in:
David Steele
2017-06-21 20:46:49 -04:00
parent 8b9965abcb
commit f596702c5b
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/xml/release.xml
View File

@@ -182,6 +182,10 @@
<release-item> <release-item>
<p>Remove support for <postgres/> 8.3.</p> <p>Remove support for <postgres/> 8.3.</p>
</release-item> </release-item>
<release-item>
<p>Improve <proper>S3</proper> error reporting.</p>
</release-item>
</release-refactor-list> </release-refactor-list>
</release-core-list> </release-core-list>

6
lib/pgBackRest/Common/Http/Client.pm
View File

@@ -127,13 +127,13 @@ sub new
# Read the response headers # Read the response headers
$self->{iContentLength} = undef; $self->{iContentLength} = undef;
my $strResponseHeader = ''; $self->{strResponseHeader} = '';
my $strHeader = trim($self->readLine()); my $strHeader = trim($self->readLine());
while ($strHeader ne '') while ($strHeader ne '')
{ {
# Validate header # Validate header
$strResponseHeader .= "${strHeader}\n"; $self->{strResponseHeader} .= "${strHeader}\n";
my $iColonPos = index($strHeader, ':'); my $iColonPos = index($strHeader, ':');
@@ -275,8 +275,10 @@ sub responseBody
# Properties. # Properties.
#################################################################################################################################### ####################################################################################################################################
sub contentLength {shift->{iContentLength}} # Content length if available (-1 means not known yet) sub contentLength {shift->{iContentLength}} # Content length if available (-1 means not known yet)
sub requestHeaderText {trim(shift->{strRequestHeader})}
sub responseCode {shift->{iResponseCode}} sub responseCode {shift->{iResponseCode}}
sub responseHeader {shift->{hResponseHeader}} sub responseHeader {shift->{hResponseHeader}}
sub responseHeaderText {trim(shift->{strResponseHeader})}
sub responseMessage {shift->{strResponseMessage}} sub responseMessage {shift->{strResponseMessage}}
sub responseProtocol {shift->{strResponseProtocol}} sub responseProtocol {shift->{strResponseProtocol}}

4
lib/pgBackRest/Storage/S3/Request.pm
View File

@@ -186,7 +186,9 @@ sub request
confess &log(ERROR, confess &log(ERROR,
"S3 request error [$iReponseCode] " . $oHttpClient->responseMessage() . "S3 request error [$iReponseCode] " . $oHttpClient->responseMessage() .
(defined($$rstrResponseBody) ? ":\n${$rstrResponseBody}" : ''), "\n*** request header ***\n" . $oHttpClient->requestHeaderText() .
"\n*** reponse header ***\n" . $oHttpClient->responseHeaderText() .
(defined($$rstrResponseBody) ? "\n*** response body ***\n${$rstrResponseBody}" : ''),
ERROR_PROTOCOL); ERROR_PROTOCOL);
} }
} }