From 855b3ccdc0b8c369d9f02de536060e74ea3fa575 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Oct 2021 00:21:54 -0600 Subject: [PATCH] chore: bump signal-hook from 0.2.3 to 0.3.10 (#21081) * chore: bump signal-hook from 0.2.3 to 0.3.10 Bumps [signal-hook](https://github.com/vorner/signal-hook) from 0.2.3 to 0.3.10. - [Release notes](https://github.com/vorner/signal-hook/releases) - [Changelog](https://github.com/vorner/signal-hook/blob/master/CHANGELOG.md) - [Commits](https://github.com/vorner/signal-hook/compare/v0.2.3...v0.3.10) --- updated-dependencies: - dependency-name: signal-hook dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update apis Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tyera Eulberg --- Cargo.lock | 4 ++-- ledger-tool/Cargo.toml | 2 +- ledger-tool/src/main.rs | 2 +- validator/Cargo.toml | 2 +- validator/src/lib.rs | 11 ++++++----- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 141968d98..a7fde0d6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4131,9 +4131,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.2.3" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "844024c8913df6bfbfeee3061075ccc47216a897ac0b54a683dea3dfe16d19af" +checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" dependencies = [ "libc", "signal-hook-registry", diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index 8f63f5c53..0de8125e2 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -41,7 +41,7 @@ tokio = { version = "1", features = ["full"] } assert_cmd = "2.0" [target."cfg(unix)".dependencies] -signal-hook = "0.2.3" +signal-hook = "0.3.10" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 564f21c95..41c0101fe 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -837,7 +837,7 @@ fn main() { // `register()` is unsafe because the action is called in a signal handler // with the usual caveats. So long as this action body stays empty, we'll // be fine - unsafe { signal_hook::register(signal_hook::SIGUSR1, || {}) }.unwrap(); + unsafe { signal_hook::low_level::register(signal_hook::consts::SIGUSR1, || {}) }.unwrap(); } const DEFAULT_ROOT_COUNT: &str = "1"; diff --git a/validator/Cargo.toml b/validator/Cargo.toml index 09597edcf..d2c08d7ae 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -56,7 +56,7 @@ jemallocator = {package = "tikv-jemallocator", version = "0.4.1", features = ["u [target."cfg(unix)".dependencies] libc = "0.2.105" -signal-hook = "0.2.3" +signal-hook = "0.3.10" sysctl = "0.4.2" [package.metadata.docs.rs] diff --git a/validator/src/lib.rs b/validator/src/lib.rs index c1cbed35c..0958bcd60 100644 --- a/validator/src/lib.rs +++ b/validator/src/lib.rs @@ -55,11 +55,12 @@ pub fn redirect_stderr_to_file(logfile: Option) -> Option #[cfg(unix)] { use log::info; - let signals = signal_hook::iterator::Signals::new(&[signal_hook::SIGUSR1]) - .unwrap_or_else(|err| { - eprintln!("Unable to register SIGUSR1 handler: {:?}", err); - exit(1); - }); + let mut signals = + signal_hook::iterator::Signals::new(&[signal_hook::consts::SIGUSR1]) + .unwrap_or_else(|err| { + eprintln!("Unable to register SIGUSR1 handler: {:?}", err); + exit(1); + }); solana_logger::setup_with_default(filter); redirect_stderr(&logfile);