From 1c623c091c84c91d572b9d7e27a47b1048caf5e7 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 19 May 2023 13:00:36 -0600 Subject: [PATCH] Slightly better logging --- gha-cache/src/api.rs | 2 +- nix-actions-cache/src/main.rs | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gha-cache/src/api.rs b/gha-cache/src/api.rs index 7abb008..b99d53a 100644 --- a/gha-cache/src/api.rs +++ b/gha-cache/src/api.rs @@ -336,7 +336,7 @@ impl Api { } if offset == chunk.len() { - tracing::debug!("Received first chunk for cache {:?}", allocation.0); + tracing::trace!("Received first chunk for cache {:?}", allocation.0); } let chunk_len = chunk.len(); diff --git a/nix-actions-cache/src/main.rs b/nix-actions-cache/src/main.rs index 138c507..0d69b66 100644 --- a/nix-actions-cache/src/main.rs +++ b/nix-actions-cache/src/main.rs @@ -32,7 +32,7 @@ use tokio::{ runtime::Runtime, sync::{oneshot, Mutex}, }; -use tracing_subscriber::EnvFilter; +use tracing_subscriber::filter::EnvFilter; use gha_cache::{Api, Credentials}; @@ -148,7 +148,7 @@ fn main() { let rt = Runtime::new().unwrap(); rt.block_on(async move { - tracing::info!("listening on {}", args.listen); + tracing::info!("Listening on {}", args.listen); axum::Server::bind(&args.listen) .serve(app.into_make_service()) .with_graceful_shutdown(async move { @@ -163,12 +163,18 @@ fn main() { fn init_logging() { let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| { #[cfg(debug_assertions)] - return EnvFilter::new("info,gha_cache=debug,nix_action_cache=debug"); + return EnvFilter::new("info") + .add_directive("nix_actions_cache=debug".parse().unwrap()) + .add_directive("gha_cache=debug".parse().unwrap()); #[cfg(not(debug_assertions))] return EnvFilter::new("info"); }); - tracing_subscriber::fmt().with_env_filter(filter).init(); + + tracing_subscriber::fmt() + .without_time() + .with_env_filter(filter) + .init(); } #[cfg(debug_assertions)]