Hopiu/lychee
1
0
Fork 0
mirror of https://github.com/Hopiu/lychee.git synced 2026-03-16 20:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly wire in tokio-console (#1482)

Browse source
This commit is contained in:
Matthias Endler 2024-08-07 23:09:47 +02:00 committed by GitHub
parent d0c5af9acf
commit 24d84e0045
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.cargo/config.toml Normal file
View file

@ -0,0 +1,3 @@
[build]
# Required for tokio-console support
rustflags = ["--cfg", "tokio_unstable"]

15
lychee-bin/Cargo.toml
View file

@ -20,7 +20,6 @@ anyhow = "1.0.86"
assert-json-diff = "2.0.2"
clap = { version = "4.5.13", features = ["env", "derive"] }
console = "0.15.8"
console-subscriber = { version = "0.4.0", optional = true }
const_format = "0.2.32"
csv = "1.3.0"
dashmap = { version = "6.0.1", features = ["serde"] }
@ -69,8 +68,18 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
uuid = { version = "1.10.0", features = ["v4"] }
wiremock = "0.6.1"
[dependencies.console-subscriber]
version = "0.4.0"
optional = true
[dependencies.tracing-subscriber]
version = "0.3.18"
default-features = false
features = ["fmt", "env-filter"]
optional = true
[features]
tokio-console = ["console-subscriber", "tracing-subscriber/registry"]
tokio-console = ["dep:console-subscriber", "dep:tracing-subscriber"]
# Compile and statically link a copy of OpenSSL.
vendored-openssl = ["openssl-sys/vendored"]
@ -97,7 +106,7 @@ name = "cli"
path = "tests/cli.rs"
required-features = ["check_example_domains"]
# metadata for cargo-binstall to get the right artifacts
# Metadata for cargo-binstall to get the right artifacts
[package.metadata.binstall]
pkg-url = "{ repo }/releases/download/v{ version }/{ name }-v{ version }-{ target }{ archive-suffix }"
bin-dir = "{ bin }{ binary-ext }"

5
lychee-bin/src/main.rs
View file

@ -117,8 +117,9 @@ const LYCHEEIGNORE_COMMENT_MARKER: &str = "#";
fn main() -> Result<()> {
#[cfg(feature = "tokio-console")]
console_subscriber::init();
// std::process::exit doesn't guarantee that all destructors will be ran,
// therefore we wrap "main" code in another function to ensure that.
// std::process::exit doesn't guarantee that all destructors will be run,
// therefore we wrap the main code in another function to ensure that.
// See: https://doc.rust-lang.org/stable/std/process/fn.exit.html
// Also see: https://www.youtube.com/watch?v=zQC8T71Y8e4
let exit_code = run_main()?;