db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-14 10:13:05 +02:00
Code Issues Releases Activity

Fixed a spurious archive-get log message that indicated an exit code of 1 was an abnormal termination.

Browse Source
This commit is contained in:
David Steele 2017-01-31 10:36:59 -05:00
parent 9b92edddbe
commit 7418559a67
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/xml/release.xml
View File

@ -180,6 +180,10 @@
<release-item>
<p>Fixed an issue where protocol mismatch errors did not output the expected value.</p>
</release-item>
<release-item>
<p>Fixed a spurious <cmd>archive-get</cmd> log message that indicated an exit code of 1 was an abnormal termination.</p>
</release-item>
</release-bug-list>
<release-feature-list>

2
lib/pgBackRest/Common/Exit.pm
View File

@ -95,7 +95,7 @@ sub exitSafe
}
# Log command end
commandEnd($iExitCode, $strSignal);
commandEnd(defined($oException) || $iExitCode == ERROR_TERM ? $iExitCode : undef, $strSignal);
# Log return values if any
logDebugReturn

2
test/expect/archive-get-001.log
View File

@ -148,5 +148,5 @@ P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 1, oException = [undef], s
P00 DEBUG: Protocol::Protocol::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef]
P00 DEBUG: Protocol::Protocol::protocolDestroy=>: iExitStatus = 0
P00 DEBUG: Common::Lock::lockRelease(): bFailOnNoLock = false
P00 INFO: archive-get command end: aborted with exception [1]
P00 INFO: archive-get command end: completed successfully
P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 1

2
test/expect/archive-get-003.log
View File

@ -148,5 +148,5 @@ P00 DEBUG: Common::Exit::exitSafe(): iExitCode = 1, oException = [undef], s
P00 DEBUG: Protocol::Protocol::protocolDestroy(): bComplete = true, iRemoteIdx = [undef], strRemoteType = [undef]
P00 DEBUG: Protocol::Protocol::protocolDestroy=>: iExitStatus = 0
P00 DEBUG: Common::Lock::lockRelease(): bFailOnNoLock = false
P00 INFO: archive-get command end: aborted with exception [1]
P00 INFO: archive-get command end: completed successfully
P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 1

2
test/expect/archive-get-005.log
View File

@ -147,5 +147,5 @@ P00 DEBUG: Protocol::Protocol::protocolDestroy: found cached protocol: iRem
P00 DEBUG: Protocol::CommandMaster->close=>: iExitStatus = 0
P00 DEBUG: Protocol::Protocol::protocolDestroy=>: iExitStatus = 0
P00 DEBUG: Common::Lock::lockRelease(): bFailOnNoLock = false
P00 INFO: archive-get command end: aborted with exception [1]
P00 INFO: archive-get command end: completed successfully
P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 1

2
test/expect/archive-get-007.log
View File

@ -147,5 +147,5 @@ P00 DEBUG: Protocol::Protocol::protocolDestroy: found cached protocol: iRem
P00 DEBUG: Protocol::CommandMaster->close=>: iExitStatus = 0
P00 DEBUG: Protocol::Protocol::protocolDestroy=>: iExitStatus = 0
P00 DEBUG: Common::Lock::lockRelease(): bFailOnNoLock = false
P00 INFO: archive-get command end: aborted with exception [1]
P00 INFO: archive-get command end: completed successfully
P00 DEBUG: Common::Exit::exitSafe=>: iExitCode = 1