Fix crashes on SIGINT#1814
Merged
foriequal0 merged 4 commits intoCodeChain-io:masterfrom Oct 18, 2019
Merged
Conversation
Contributor
|
And please resolve the conflicts. |
foriequal0
force-pushed
the
fix/sigint
branch
from
6eeed8b to
3d7fb50
Compare
Contributor
|
It seems the lockfile has some problem with your patched jsonrpc repo. |
foriequal0
force-pushed
the
fix/sigint
branch
from
3d7fb50 to
2215e42
Compare
majecty
requested changes
Oct 15, 2019
| } | ||
| if let Some(server) = ws_server { | ||
| server.close_handle().close(); | ||
| server.wait().map_err(|err| format!("Error while closing jsonrpc ws server: {}", err))?; |
There was a problem hiding this comment.
Why use map_erro only for ws_server?
rpc_server and ipc_server don't need it?
Contributor
Author
There was a problem hiding this comment.
I didn't touch the interface. jsonrpc returns Result<()> only for ws_
sgkim126
reviewed
Oct 15, 2019
majecty
previously approved these changes
Oct 16, 2019
remagpie
previously approved these changes
Oct 16, 2019
sgkim126
previously approved these changes
Oct 16, 2019
Contributor
|
@foriequal0 What's the status here? Is it ready to be merged? |
foriequal0
dismissed stale reviews from sgkim126, remagpie, and majecty
via
f440038
foriequal0
force-pushed
the
fix/sigint
branch
from
5b808a6 to
f440038
Compare
…1.17) Update following packages: bytes v0.4.7 -> v0.4.12 parking_lot_core v0.6.1 -> v0.6.2 toml v0.5.1 -> v0.5.3 tokio v0.1.7 -> v0.1.17 Commands were: ``` cargo update --package bytes cargo update --package parking_lot_core:0.6.1 cargo update --package toml:0.5.1 cargo update --package tokio:0.1.7 --precise 0.1.17 ``` Errors were: 1. bytes: jsonrpc requires ^0.4.8, and bytes were pinned to v0.4.7 for sendgrid v0.8.1. 2. parking_lot_core: Amanieu/parking_lot#181 3. toml: `forward_to_deserialize_any_helper` was replaced by forward_to_deserialize_any 4. tokio: `Builder::core_threads` was introduced in 0.1.10
The fix (paritytech/jsonrpc#504) has been merged to `master`. It'll take times to relase, so use the merged master directly.
foriequal0
force-pushed
the
fix/sigint
branch
from
f440038 to
26f08f2
Compare
Contributor
Author
|
I've rebased the PR and changed the package sources to the parity's merged master. |
remagpie
approved these changes
Oct 18, 2019
majecty
approved these changes
Oct 18, 2019
Contributor
Author
|
I'll merge it without waiting for Travis. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolve: #348