Skip to content

Commit 1e66a57

Browse files
authored
admin/delete_crate: Improve logging output (#9519)
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.
1 parent 6d1789d commit 1e66a57

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/admin/delete_crate.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,33 +80,33 @@ pub fn run(opts: Opts) -> anyhow::Result<()> {
8080

8181
for name in &crate_names {
8282
if let Some((id, _)) = existing_crates.get(name) {
83-
info!(%name, "Deleting crate from the database");
83+
info!("{name}: Deleting crate from the database");
8484
if let Err(error) = diesel::delete(crates::table.find(id)).execute(conn) {
85-
warn!(%name, %id, ?error, "Failed to delete crate from the database");
85+
warn!(%id, "{name}: Failed to delete crate from the database: {error}");
8686
}
8787
} else {
88-
info!(%name, "Skipping missing crate");
88+
info!("{name}: Skipped missing crate");
8989
};
9090

91-
info!(%name, "Enqueuing index sync jobs");
91+
info!("{name}: Enqueuing index sync jobs");
9292
if let Err(error) = jobs::enqueue_sync_to_index(name, conn) {
93-
warn!(%name, ?error, "Failed to enqueue index sync jobs");
93+
warn!("{name}: Failed to enqueue index sync jobs: {error}");
9494
}
9595

96-
info!(%name, "Deleting crate files from S3");
96+
info!("{name}: Deleting crate files from S3");
9797
if let Err(error) = rt.block_on(store.delete_all_crate_files(name)) {
98-
warn!(%name, ?error, "Failed to delete crate files from S3");
98+
warn!("{name}: Failed to delete crate files from S3: {error}");
9999
}
100100

101-
info!(%name, "Deleting readme files from S3");
101+
info!("{name}: Deleting readme files from S3");
102102
if let Err(error) = rt.block_on(store.delete_all_readmes(name)) {
103-
warn!(%name, ?error, "Failed to delete readme files from S3");
103+
warn!("{name}: Failed to delete readme files from S3: {error}");
104104
}
105105

106-
info!(%name, "Deleting RSS feed from S3");
106+
info!("{name}: Deleting RSS feed from S3");
107107
let feed_id = FeedId::Crate { name };
108108
if let Err(error) = rt.block_on(store.delete_feed(&feed_id)) {
109-
warn!(%name, ?error, "Failed to delete RSS feed from S3");
109+
warn!("{name}: Failed to delete RSS feed from S3: {error}");
110110
}
111111
}
112112

0 commit comments

Comments
 (0)