Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ clap = "2"
cli-signer= { path = "cli-signer" }
client-traits = { path = "ethcore/client-traits" }
common-types = { path = "ethcore/types" }
ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
ctrlc = { version = "3.1.4", features = ["termination"] }
dir = { path = "util/dir" }
docopt = "1.0"
engine = { path = "ethcore/engine" }
Expand Down
5 changes: 2 additions & 3 deletions parity/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::{process, env};

use ansi_term::Colour;
use ctrlc::CtrlC;
use dir::default_hypervisor_path;
use fdlimit::raise_fd_limit;
use ethcore_logger::setup_log;
Expand Down Expand Up @@ -299,7 +298,7 @@ fn main_direct(force_can_restart: bool) -> i32 {
}
});

CtrlC::set_handler({
ctrlc::set_handler({
let e = exit.clone();
let exiting = exiting.clone();
move || {
Expand All @@ -313,7 +312,7 @@ fn main_direct(force_can_restart: bool) -> i32 {
e.1.notify_all();
}
}
});
}).expect("Error setting Ctrl-C handler");

// so the client has started successfully
// if this is a daemon, detach from the parent process
Expand Down