Skip to content

Commit

Permalink
Remaining fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ii-cruz authored and jsdanielh committed Dec 6, 2024
1 parent 9390bbe commit e0ec21b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 81 deletions.
14 changes: 11 additions & 3 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,17 @@ hex = "0.4"
http = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
hyper = { version = "1", default-features = false, optional = true }
hyper-rustls = { version = "0.27", features = ["native-tokio", "http1", "tls12", "logging", "ring"], default-features = false, optional = true }
hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "tokio"], optional = true }
hyper-rustls = { version = "0.27", features = [
"native-tokio",
"http1",
"tls12",
"logging",
"ring",
], default-features = false, optional = true }
hyper-util = { version = "0.1", default-features = false, features = [
"client-legacy",
"tokio",
], optional = true }
instant = { version = "0.1", features = ["wasm-bindgen"] }
log = { workspace = true }
log-panics = { version = "2.1", features = ["with-backtrace"], optional = true }
Expand Down Expand Up @@ -118,7 +127,6 @@ full-consensus = [
"nimiq-dht",
"nimiq-network-libp2p/kad",
]
launcher = []
logging = ["nimiq-log", "serde_json", "tokio", "tracing-subscriber"]
loki = ["logging", "tracing-loki"]
metrics-server = [
Expand Down
2 changes: 2 additions & 0 deletions lib/src/extras/deadlock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ use std::{thread, time::Duration};

use parking_lot::deadlock;

// This code is not being used. We want to keep it for possible future reactivation.
// The deadlock detection was giving too many false positives.
pub fn initialize_deadlock_detection() {
// Create a background thread which checks for deadlocks every 10s
thread::spawn(move || loop {
Expand Down
76 changes: 0 additions & 76 deletions lib/src/extras/launcher.rs

This file was deleted.

2 changes: 0 additions & 2 deletions lib/src/extras/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
pub mod deadlock;
#[cfg(feature = "dht-fallback")]
pub mod dht_fallback;
#[cfg(feature = "launcher")]
pub mod launcher;
#[cfg(feature = "logging")]
pub mod logging;
#[cfg(feature = "metrics-server")]
Expand Down

0 comments on commit e0ec21b

Please sign in to comment.