Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release-horizon-v1.12.0 into master #3250

Merged
merged 3 commits into from
Nov 24, 2020
Merged

Conversation

bartekn
Copy link
Contributor

@bartekn bartekn commented Nov 24, 2020

@2opremio doing this sooner because I want to test #3249 makes any difference in stg.

bartekn and others added 3 commits November 17, 2020 22:15
Fixes off-by-one bug in `CaptiveStellarCore.runFromParams`. In 21e076a a
`TrustedLedgerHashStore` interface was added and used in
`CaptiveStellarCore`. However, due to copy-paste the `GetLedgerHash`
method was called with a wrong param (`from` instead of `from-1`). This
happened because similar call to `archive.GetLedgerHeader` was copied
however, in this call we use a `PreviousLedgerHash` instead.
This commit correctly sets the log level in the captive core api logger. With this fix the captive core api logs are now visible and formatted correctly.

This commit also marks the active request as invalid whenever a captive core function returns an error. By marking the active request as invalid we ensure that the captive core subprocess is recreated the next time POST /prepare-range is invoked.
@bartekn bartekn requested a review from a team November 24, 2020 15:27
@cla-bot cla-bot bot added the cla: yes label Nov 24, 2020
@bartekn bartekn merged commit 2276557 into master Nov 24, 2020
@bartekn bartekn deleted the release-horizon-v1.12.0 branch November 24, 2020 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants