From 3bc019d996960fe73f770d1b2a93a3cae6de39c0 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 24 Apr 2024 15:17:35 -0700 Subject: [PATCH] wip: no, but do flakehub after shutting down the web server --- magic-nix-cache/src/api.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/magic-nix-cache/src/api.rs b/magic-nix-cache/src/api.rs index 702a1dd..9e35da6 100644 --- a/magic-nix-cache/src/api.rs +++ b/magic-nix-cache/src/api.rs @@ -45,18 +45,17 @@ async fn workflow_finish( gha_cache.shutdown().await?; } - // Wait for the Attic push workers to finish. - if let Some(attic_state) = state.flakehub_state.write().await.take() { - tracing::info!("Waiting for FlakeHub cache uploads to finish"); - attic_state.push_session.wait().await?; - } - if let Some(sender) = state.shutdown_sender.lock().await.take() { sender .send(()) .map_err(|_| Error::Internal("Sending shutdown server message".to_owned()))?; } + if let Some(attic_state) = state.flakehub_state.write().await.take() { + tracing::info!("Waiting for FlakeHub cache uploads to finish"); + attic_state.push_session.wait().await?; + } + // NOTE(cole-h): see `init_logging` let logfile = std::env::temp_dir().join("magic-nix-cache-tracing.log"); let logfile_contents = std::fs::read_to_string(logfile)?;