diff --git a/Cargo.lock b/Cargo.lock index abd5657a..017a967d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -181,28 +181,6 @@ dependencies = [ "zstd-safe", ] -[[package]] -name = "async-stream" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "async-trait" version = "0.1.88" @@ -309,7 +287,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", "tracing", @@ -364,7 +342,7 @@ dependencies = [ "mime", "pin-project-lite", "serde", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", ] @@ -425,12 +403,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -751,45 +723,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "console-api" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857" -dependencies = [ - "futures-core", - "prost", - "prost-types", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures-task", - "hdrhistogram", - "humantime", - "hyper-util", - "prost", - "prost-types", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "const-oid" version = "0.9.6" @@ -1568,7 +1501,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.9.0", + "indexmap", "slab", "tokio", "tokio-util", @@ -1591,38 +1524,19 @@ version = "0.1.2+12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "647deb1583b14d160f85f3ff626f20b6edd366e3852c9843b06077388f794cb6" -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "base64 0.21.7", - "byteorder", - "flate2", - "nom", - "num-traits", -] - [[package]] name = "headers" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "headers-core", "http", @@ -1849,12 +1763,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" - [[package]] name = "hyper" version = "1.6.0" @@ -1894,25 +1802,12 @@ dependencies = [ "webpki-roots 1.0.0", ] -[[package]] -name = "hyper-timeout" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" -dependencies = [ - "hyper", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.14" source = "git+https://github.com/matrix-construct/hyper-util?rev=c4fd9b4cd3a59fcfd28ca3802d68a8ea8988d9a3#c4fd9b4cd3a59fcfd28ca3802d68a8ea8988d9a3" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-channel", "futures-core", @@ -2076,16 +1971,6 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.9.0" @@ -2093,7 +1978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.4", + "hashbrown", "serde", ] @@ -2828,7 +2713,7 @@ checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ "futures-core", "futures-sink", - "indexmap 2.9.0", + "indexmap", "js-sys", "once_cell", "pin-project-lite", @@ -3188,38 +3073,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" -dependencies = [ - "anyhow", - "itertools 0.14.0", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prost-types" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" -dependencies = [ - "prost", -] - [[package]] name = "pulldown-cmark" version = "0.13.0" @@ -3512,7 +3365,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119" dependencies = [ "async-compression", - "base64 0.22.1", + "base64", "bytes", "futures-channel", "futures-core", @@ -3544,7 +3397,7 @@ dependencies = [ "tokio-rustls", "tokio-socks", "tokio-util", - "tower 0.5.2", + "tower", "tower-http", "tower-service", "url", @@ -3643,12 +3496,12 @@ version = "0.13.0" source = "git+https://github.com/matrix-construct/ruma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4" dependencies = [ "as_variant", - "base64 0.22.1", + "base64", "bytes", "form_urlencoded", "getrandom 0.2.16", "http", - "indexmap 2.9.0", + "indexmap", "js_int", "konst", "percent-encoding", @@ -3675,7 +3528,7 @@ version = "0.28.1" source = "git+https://github.com/matrix-construct/ruma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4" dependencies = [ "as_variant", - "indexmap 2.9.0", + "indexmap", "js_int", "js_option", "percent-encoding", @@ -3767,7 +3620,7 @@ name = "ruma-signatures" version = "0.15.0" source = "git+https://github.com/matrix-construct/ruma?rev=920148dca1076454ca0ca5d43b5ce1aa708381d4#920148dca1076454ca0ca5d43b5ce1aa708381d4" dependencies = [ - "base64 0.22.1", + "base64", "ed25519-dalek", "pkcs8", "rand 0.8.5", @@ -4179,7 +4032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d2de91cf02bbc07cde38891769ccd5d4f073d22a40683aa4bc7a95781aaa2c4" dependencies = [ "form_urlencoded", - "indexmap 2.9.0", + "indexmap", "itoa", "ryu", "serde", @@ -4244,7 +4097,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.9.0", + "indexmap", "itoa", "ryu", "serde", @@ -4822,7 +4675,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.9.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -4836,56 +4689,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" -[[package]] -name = "tonic" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.22.1", - "bytes", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "prost", - "socket2", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.5.2" @@ -4919,7 +4722,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", "tracing", @@ -5033,7 +4836,6 @@ name = "tuwunel" version = "1.0.0" dependencies = [ "clap", - "console-subscriber", "const-str", "ctor", "hardened_malloc-rs", @@ -5089,7 +4891,7 @@ dependencies = [ "axum", "axum-client-ip", "axum-extra", - "base64 0.22.1", + "base64", "bytes", "const-str", "ctor", @@ -5227,7 +5029,7 @@ dependencies = [ "sentry-tracing", "serde_json", "tokio", - "tower 0.5.2", + "tower", "tower-http", "tracing", "tuwunel_admin", @@ -5241,7 +5043,7 @@ name = "tuwunel_service" version = "1.0.0" dependencies = [ "async-trait", - "base64 0.22.1", + "base64", "blurhash", "bytes", "const-str", @@ -5362,7 +5164,7 @@ version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" dependencies = [ - "base64 0.22.1", + "base64", "log", "once_cell", "rustls", diff --git a/Cargo.toml b/Cargo.toml index d4a2e749..32457559 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -131,8 +131,9 @@ features = [ "usage", ] -[workspace.dependencies.console-subscriber] -version = "0.4" +# Disabled until Axum updated. Remember to remove cfgs for tuwunel_disable. +#[workspace.dependencies.console-subscriber] +#version = "0.4" [workspace.dependencies.core_affinity] version = "0.8.1" diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index f371a15d..594d79b4 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -146,7 +146,7 @@ systemd = [ ] # enable the tokio_console server ncompatible with release_max_log_level tokio_console = [ - "dep:console-subscriber", + #"dep:console-subscriber", "tokio/tracing", ] url_preview = [ @@ -173,8 +173,8 @@ tuwunel-router.workspace = true tuwunel-service.workspace = true clap.workspace = true -console-subscriber.optional = true -console-subscriber.workspace = true +#console-subscriber.optional = true +#console-subscriber.workspace = true const-str.workspace = true ctor.workspace = true log.workspace = true diff --git a/src/main/logging.rs b/src/main/logging.rs index 5122b377..af9adf24 100644 --- a/src/main/logging.rs +++ b/src/main/logging.rs @@ -117,7 +117,7 @@ pub(crate) fn init( // compile-time and runtime conditions to elide it, each of those changing the // subscriber's type. let (console_enabled, console_disabled_reason) = tokio_console_enabled(config); - #[cfg(all(feature = "tokio_console", tokio_unstable))] + #[cfg(all(feature = "tokio_console", tokio_unstable, tuwunel_disable))] if console_enabled { let console_layer = console_subscriber::ConsoleLayer::builder() .with_default_env() @@ -139,7 +139,7 @@ pub(crate) fn init( } fn tokio_console_enabled(config: &Config) -> (bool, &'static str) { - if !cfg!(all(feature = "tokio_console", tokio_unstable)) { + if !cfg!(all(feature = "tokio_console", tokio_unstable, tuwunel_disable)) { return (false, ""); }