From edba359400aa381d3c7cf6731827131bb0b13bff Mon Sep 17 00:00:00 2001
From: Igor Katson <igor.katson@gmail.com>
Date: Thu, 29 Aug 2024 00:35:03 +0100
Subject: [PATCH] Make tokio-console feature flag actually work

---
 Cargo.lock                                             | 1 +
 Makefile                                               | 7 ++++---
 crates/librqbit/Cargo.toml                             | 2 ++
 crates/librqbit/src/tracing_subscriber_config_utils.rs | 7 +++++++
 crates/rqbit/Cargo.toml                                | 4 ++--
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 00f5ed5..5988e38 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1456,6 +1456,7 @@ dependencies = [
  "bitvec",
  "byteorder",
  "bytes",
+ "console-subscriber",
  "dashmap 6.0.1",
  "futures",
  "hex 0.4.3",
diff --git a/Makefile b/Makefile
index e7c3fbf..9277346 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,13 @@ webui-dev: webui-deps
 export RQBIT_UPNP_SERVER_ENABLE ?= true
 export RQBIT_UPNP_SERVER_FRIENDLY_NAME ?= rqbit-dev
 export RQBIT_HTTP_API_LISTEN_ADDR ?= 0.0.0.0:3030
+CARGO_RUN_FLAGS ?= ""
 RQBIT_OUTPUT_FOLDER ?= /tmp/scratch
 RQBIT_POSTGRES_CONNECTION_STRING ?= postgres:///rqbit
 
 @PHONY: devserver-release
 devserver-profile:
-	cargo run --release -- server start $(RQBIT_OUTPUT_FOLDER)
+	cargo run --release $(CARGO_RUN_FLAGS) -- server start $(RQBIT_OUTPUT_FOLDER)
 
 # DEV variables (that's why defined after devserver-profile)
 export RQBIT_LOG_FILE ?= /tmp/rqbit-log
@@ -29,13 +30,13 @@ export CORS_ALLOW_REGEXP ?= '.*'
 @PHONY: devserver
 devserver:
 	echo -n '' > $(RQBIT_LOG_FILE) && \
-	cargo run -- \
+	cargo run $(CARGO_RUN_FLAGS) -- \
 	server start $(RQBIT_OUTPUT_FOLDER)
 
 @PHONY: devserver
 devserver-postgres:
 	echo -n '' > $(RQBIT_LOG_FILE) && \
-	cargo run -- \
+	cargo run $(CARGO_RUN_FLAGS) -- \
 	server start --fastresume --persistence-location $(RQBIT_POSTGRES_CONNECTION_STRING) $(RQBIT_OUTPUT_FOLDER)
 
 @PHONY: docker-build-xx-one-platform
diff --git a/crates/librqbit/Cargo.toml b/crates/librqbit/Cargo.toml
index 7cc9b25..cfdfe5d 100644
--- a/crates/librqbit/Cargo.toml
+++ b/crates/librqbit/Cargo.toml
@@ -13,6 +13,7 @@ readme = "README.md"
 
 [features]
 default = ["default-tls"]
+tokio-console = ["console-subscriber", "tokio/tracing"]
 http-api = ["axum", "tower-http"]
 upnp-serve-adapter = ["upnp-serve"]
 webui = []
@@ -59,6 +60,7 @@ tokio = { version = "1", features = [
     "fs",
     "io-util",
 ] }
+console-subscriber = { version = "0.4", optional = true }
 axum = { version = "0.7", optional = true }
 tower-http = { version = "0.5", features = ["cors", "trace"], optional = true }
 tokio-stream = "0.1"
diff --git a/crates/librqbit/src/tracing_subscriber_config_utils.rs b/crates/librqbit/src/tracing_subscriber_config_utils.rs
index b719a30..e4856c2 100644
--- a/crates/librqbit/src/tracing_subscriber_config_utils.rs
+++ b/crates/librqbit/src/tracing_subscriber_config_utils.rs
@@ -91,6 +91,13 @@ pub fn init_logging(opts: InitLoggingOptions) -> anyhow::Result<InitLoggingResul
                 .with_writer(line_sub)
                 .with_filter(EnvFilter::builder().parse("info,librqbit=debug").unwrap()),
         );
+
+    #[cfg(feature = "tokio-console")]
+    let console_layer = console_subscriber::spawn();
+
+    #[cfg(feature = "tokio-console")]
+    let layered = layered.with(console_layer);
+
     if let Some(log_file) = &opts.log_file {
         let log_file = log_file.to_string();
         let log_file = std::sync::Mutex::new(LineWriter::new(
diff --git a/crates/rqbit/Cargo.toml b/crates/rqbit/Cargo.toml
index 217aa5c..61b6e2e 100644
--- a/crates/rqbit/Cargo.toml
+++ b/crates/rqbit/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 [features]
 default = ["default-tls", "postgres", "webui"]
 openssl-vendored = ["openssl/vendored"]
-tokio-console = ["console-subscriber", "tokio/tracing"]
+tokio-console = ["librqbit/tokio-console"]
 webui = ["librqbit/webui"]
 timed_existence = ["librqbit/timed_existence"]
 default-tls = ["librqbit/default-tls"]
@@ -27,7 +27,7 @@ librqbit = { version = "7.0.0", path = "../librqbit", default-features = false,
     "http-api",
     "tracing-subscriber-utils",
     "upnp-serve-adapter",
-]}
+] }
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 console-subscriber = { version = "0.4", optional = true }
 anyhow = "1"