From 754dfa11de1960a6ebef725c9babb97ec167098d Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 10 Nov 2024 14:32:10 +0100 Subject: [PATCH] Revert "admin/render_readmes: Remove redundant tokio runtime" This reverts commit dda300ebb8ef8b3026c4b42d93593c9e6a0b1c49. The relevant code was used inside a `std::thread::spawn()` block, which currently does not have an attached tokio runtime, which means that `Handle::current()` panics in this case. Reverting the commit fixes the issue for now, but this should probably be refactored to use tokio tasks anyway... --- src/bin/crates-admin/render_readmes.rs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/bin/crates-admin/render_readmes.rs b/src/bin/crates-admin/render_readmes.rs index 24122040ae7..96233cf2eb9 100644 --- a/src/bin/crates-admin/render_readmes.rs +++ b/src/bin/crates-admin/render_readmes.rs @@ -125,13 +125,17 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> { println!("[{}-{}] Rendering README...", krate_name, version.num); let readme = get_readme(&storage, &client, &version, &krate_name)?; if !readme.is_empty() { - Handle::current() - .block_on(storage.upload_readme( - &krate_name, - &version.num, - readme.into(), - )) - .context("Failed to upload rendered README file to S3")?; + let rt = tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + .context("Failed to initialize tokio runtime")?; + + rt.block_on(storage.upload_readme( + &krate_name, + &version.num, + readme.into(), + )) + .context("Failed to upload rendered README file to S3")?; } Ok(())