From 826db30d2b21f5dcd269e6b6f0f6416c33a7c948 Mon Sep 17 00:00:00 2001 From: durch Date: Wed, 20 Dec 2023 16:15:18 +0100 Subject: [PATCH 1/2] Add tokio-console feature --- mixnode/Cargo.toml | 4 ++++ mixnode/src/main.rs | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml index 25a6a8d5a7..4979051b72 100644 --- a/mixnode/Cargo.toml +++ b/mixnode/Cargo.toml @@ -35,6 +35,7 @@ serde_json = { workspace = true } sysinfo = "0.27.7" tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } tokio-util = { workspace = true, features = ["codec"] } +console-subscriber = { version = "0.2", optional = true } toml = "0.5.8" url = { workspace = true, features = ["serde"] } cfg-if = "1.0.0" @@ -83,6 +84,9 @@ cpucycles = [ "nym-bin-common/tracing", ] +# build with RUSTFLAGS="--cfg tokio_unstable" +tokio-console = ["console-subscriber", "tokio/tracing"] + [package.metadata.deb] name = "nym-mixnode" maintainer-scripts = "debian" diff --git a/mixnode/src/main.rs b/mixnode/src/main.rs index d6383477cc..c0f902145e 100644 --- a/mixnode/src/main.rs +++ b/mixnode/src/main.rs @@ -53,6 +53,12 @@ fn test_function() { #[tokio::main] async fn main() -> anyhow::Result<()> { + cfg_if::cfg_if! { + if #[cfg(feature = "console-subscriber")] { + console_subscriber::init(); + } + } + let args = Cli::parse(); setup_env(args.config_env_file.as_ref()); From 0d5f594a69bc7c4d859eaf219ddee0d7a5f9754c Mon Sep 17 00:00:00 2001 From: durch Date: Wed, 20 Dec 2023 16:16:45 +0100 Subject: [PATCH 2/2] Fix feature name --- mixnode/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mixnode/src/main.rs b/mixnode/src/main.rs index c0f902145e..b9b1db4255 100644 --- a/mixnode/src/main.rs +++ b/mixnode/src/main.rs @@ -54,7 +54,7 @@ fn test_function() { #[tokio::main] async fn main() -> anyhow::Result<()> { cfg_if::cfg_if! { - if #[cfg(feature = "console-subscriber")] { + if #[cfg(feature = "tokio-console")] { console_subscriber::init(); } }