diff options
| author | Florian Klink <flokli@flokli.de> | 2024-05-16T19·41+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-05-16T21·05+0000 |
| commit | d65e6df3ab8ef70bfc2de63a12acba23f9b97ed7 (patch) | |
| tree | 4abda92f880be96e50f5f59c7d1ac35e99978d97 | |
| parent | 6aa1d2c4a8bd7b72e6f8be243d2aa8581556cd4a (diff) | |
feat(tvix/build): drop json logging r/8151
This has already been dropped for tvix-store, drop it here as well. Change-Id: Ib3aa37bbe9fd4c498b5ba1213f7d922d0c64ffc7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11677 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: Connor Brewster <cbrewster@hey.com> Tested-by: BuildkiteCI
| -rw-r--r-- | tvix/Cargo.nix | 1 | ||||
| -rw-r--r-- | tvix/build/Cargo.toml | 2 | ||||
| -rw-r--r-- | tvix/build/src/bin/tvix-build.rs | 24 |
3 files changed, 6 insertions, 21 deletions
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 088bd6fdfc..51c7c40177 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -12772,7 +12772,6 @@ rec { { name = "tracing-subscriber"; packageId = "tracing-subscriber"; - features = [ "json" ]; } { name = "tvix-castore"; diff --git a/tvix/build/Cargo.toml b/tvix/build/Cargo.toml index 2f12905484..19463783f3 100644 --- a/tvix/build/Cargo.toml +++ b/tvix/build/Cargo.toml @@ -14,7 +14,7 @@ tokio-listener = { version = "0.4.1", features = [ "tonic011" ] } tonic = { version = "0.11.0", features = ["tls", "tls-roots"] } tvix-castore = { path = "../castore" } tracing = "0.1.37" -tracing-subscriber = { version = "0.3.16", features = ["json"] } +tracing-subscriber = { version = "0.3.16" } url = "2.4.0" [dependencies.tonic-reflection] diff --git a/tvix/build/src/bin/tvix-build.rs b/tvix/build/src/bin/tvix-build.rs index ed36c8933c..07d7e30dfd 100644 --- a/tvix/build/src/bin/tvix-build.rs +++ b/tvix/build/src/bin/tvix-build.rs @@ -23,10 +23,6 @@ use tvix_castore::proto::FILE_DESCRIPTOR_SET as CASTORE_FILE_DESCRIPTOR_SET; #[derive(Parser)] #[command(author, version, about, long_about = None)] struct Cli { - /// Whether to log in JSON - #[arg(long)] - json: bool, - #[arg(long)] log_level: Option<Level>, @@ -58,23 +54,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { // configure log settings let level = cli.log_level.unwrap_or(Level::INFO); - let subscriber = tracing_subscriber::registry() + tracing_subscriber::registry() .with( - cli.json.then_some( - tracing_subscriber::fmt::Layer::new() - .with_writer(std::io::stderr.with_max_level(level)) - .json(), - ), + tracing_subscriber::fmt::Layer::new() + .with_writer(std::io::stderr.with_max_level(level)) + .pretty(), ) - .with( - (!cli.json).then_some( - tracing_subscriber::fmt::Layer::new() - .with_writer(std::io::stderr.with_max_level(level)) - .pretty(), - ), - ); - - tracing::subscriber::set_global_default(subscriber).expect("Unable to set global subscriber"); + .init(); match cli.command { Commands::Daemon { |