From f2d76da89ad29ffc9b2bc49f1521057240ee0646 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 5 Sep 2024 13:38:57 +0200 Subject: [PATCH] admin/delete_crate: Improve logging output This makes it easier to see at a glance which crate a log message belongs to. tracing fields are useful too, but in this case it makes more sense to have the name directly in the log message. --- src/admin/delete_crate.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/admin/delete_crate.rs b/src/admin/delete_crate.rs index 9b26525e81b..72c33a8990b 100644 --- a/src/admin/delete_crate.rs +++ b/src/admin/delete_crate.rs @@ -80,33 +80,33 @@ pub fn run(opts: Opts) -> anyhow::Result<()> { for name in &crate_names { if let Some((id, _)) = existing_crates.get(name) { - info!(%name, "Deleting crate from the database"); + info!("{name}: Deleting crate from the database…"); if let Err(error) = diesel::delete(crates::table.find(id)).execute(conn) { - warn!(%name, %id, ?error, "Failed to delete crate from the database"); + warn!(%id, "{name}: Failed to delete crate from the database: {error}"); } } else { - info!(%name, "Skipping missing crate"); + info!("{name}: Skipped missing crate"); }; - info!(%name, "Enqueuing index sync jobs"); + info!("{name}: Enqueuing index sync jobs…"); if let Err(error) = jobs::enqueue_sync_to_index(name, conn) { - warn!(%name, ?error, "Failed to enqueue index sync jobs"); + warn!("{name}: Failed to enqueue index sync jobs: {error}"); } - info!(%name, "Deleting crate files from S3"); + info!("{name}: Deleting crate files from S3…"); if let Err(error) = rt.block_on(store.delete_all_crate_files(name)) { - warn!(%name, ?error, "Failed to delete crate files from S3"); + warn!("{name}: Failed to delete crate files from S3: {error}"); } - info!(%name, "Deleting readme files from S3"); + info!("{name}: Deleting readme files from S3…"); if let Err(error) = rt.block_on(store.delete_all_readmes(name)) { - warn!(%name, ?error, "Failed to delete readme files from S3"); + warn!("{name}: Failed to delete readme files from S3: {error}"); } - info!(%name, "Deleting RSS feed from S3"); + info!("{name}: Deleting RSS feed from S3…"); let feed_id = FeedId::Crate { name }; if let Err(error) = rt.block_on(store.delete_feed(&feed_id)) { - warn!(%name, ?error, "Failed to delete RSS feed from S3"); + warn!("{name}: Failed to delete RSS feed from S3: {error}"); } }