diff --git a/Cargo.lock b/Cargo.lock index 96a8898..115d479 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2085,7 +2085,7 @@ dependencies = [ [[package]] name = "opsqueue" -version = "0.34.2" +version = "0.34.3" dependencies = [ "anyhow", "arc-swap", @@ -2139,7 +2139,7 @@ dependencies = [ [[package]] name = "opsqueue_python" -version = "0.34.2" +version = "0.34.3" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 07fd513..ec73dfc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ ] [workspace.package] -version = "0.34.2" +version = "0.34.3" [workspace.lints.clippy] diff --git a/opsqueue/src/common/submission.rs b/opsqueue/src/common/submission.rs index 497d77d..d1c30a2 100644 --- a/opsqueue/src/common/submission.rs +++ b/opsqueue/src/common/submission.rs @@ -251,7 +251,6 @@ pub mod db { }; use chunk::ChunkSize; use sqlx::{query, query_as, Sqlite}; - use tracing::{info, warn}; use axum_prometheus::metrics::{counter, histogram}; @@ -422,12 +421,18 @@ pub mod db { // Forward our database errors to the caller. Err(E::L(e)) => return Err(e), // If the submission ID can't be found, that's too bad, but it's not our problem anymore i guess. - Err(E::R(_)) => warn!(%submission_id, "Presumed zero-length submission not found"), + Err(E::R(_)) => { + tracing::warn!(%submission_id, "Presumed zero-length submission not found") + } // If everything went OK, this *could* still indicate a bug in producer code, so let's just log it. // Our future selves might thank us. - Ok(true) => info!(%submission_id, "Zero-length submission marked as completed"), + Ok(true) => { + tracing::debug!(%submission_id, "Zero-length submission marked as completed") + } // This should never happen. If it does, better log it. - Ok(false) => warn!(%submission_id, "Zero-length submission wasn't zero-length?!"), + Ok(false) => { + tracing::warn!(%submission_id, "Zero-length submission wasn't zero-length?!") + } } } Ok(submission_id) diff --git a/opsqueue/src/db/mod.rs b/opsqueue/src/db/mod.rs index 36e210f..f804bcb 100644 --- a/opsqueue/src/db/mod.rs +++ b/opsqueue/src/db/mod.rs @@ -243,7 +243,7 @@ impl DBPools { } /// Performas an explicit, non-passive WAL checkpoint - /// We use the 'TRUNCATE' strategy, which will do the most work but will briefly block the writer *and* all readers + /// We use the 'RESTART' strategy, which will do the most work but will briefly block the writer *and* all readers /// /// c.f. https://www.sqlite.org/pragma.html#pragma_wal_checkpoint pub async fn perform_explicit_wal_checkpoint(&self) -> sqlx::Result<()> { @@ -251,7 +251,7 @@ impl DBPools { let res: (i32, i32, i32) = sqlx::query_as("PRAGMA wal_checkpoint(RESTART);") .fetch_one(conn.get_inner()) .await?; - tracing::warn!("WAL checkpoint completed {res:?}"); + tracing::debug!("WAL checkpoint completed {res:?}"); Ok(()) } diff --git a/opsqueue/src/server.rs b/opsqueue/src/server.rs index 27f0d7a..cfc9ec4 100644 --- a/opsqueue/src/server.rs +++ b/opsqueue/src/server.rs @@ -99,7 +99,7 @@ pub fn build_router( let _ = span.set_parent(crate::tracing::context_from_headers(request.headers())); span }) - .on_response(tower_http::trace::DefaultOnResponse::new().level(tracing::Level::INFO)); + .on_response(tower_http::trace::DefaultOnResponse::new().level(tracing::Level::DEBUG)); let traced_routes = routes.layer(tracing_middleware).layer(prometheus_config.0);