mirrors/magic-nix-cache
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #66 from DeterminateSystems/remove-spawn

Browse source 
Don't run server in tokio::spawn
This commit is contained in:
Luc Perkins 2024-05-17 14:58:46 -04:00 committed by GitHub
parent 2e05bd5fff 1bb6c86f5d
commit 3a1558438f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
magic-nix-cache/src/main.rs
View file

@ -26,7 +26,6 @@ use std::io::Write;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::exit;
use std::sync::Arc; use std::sync::Arc;
use ::attic::nix_store::NixStore; use ::attic::nix_store::NixStore;
@ -371,21 +370,6 @@ async fn main_cli() -> Result<()> {
tracing::info!("Listening on {}", args.listen); tracing::info!("Listening on {}", args.listen);
let server = axum::Server::bind(&args.listen)
.serve(app.into_make_service())
.with_graceful_shutdown(async move {
shutdown_receiver.await.ok();
tracing::info!("Shutting down");
});
// Spawn here so that post-startup tasks can proceed
tokio::spawn(async move {
if let Err(e) = server.await {
tracing::error!("failed to start up daemon: {e}");
exit(1);
}
});
// Notify of startup via HTTP // Notify of startup via HTTP
if let Some(startup_notification_url) = args.startup_notification_url { if let Some(startup_notification_url) = args.startup_notification_url {
tracing::debug!("Startup notification via HTTP POST to {startup_notification_url}"); tracing::debug!("Startup notification via HTTP POST to {startup_notification_url}");
@ -427,11 +411,21 @@ async fn main_cli() -> Result<()> {
tracing::debug!("Created startup notification file at {startup_notification_file_path:?}"); tracing::debug!("Created startup notification file at {startup_notification_file_path:?}");
} }
let ret = axum::Server::bind(&args.listen)
.serve(app.into_make_service())
.with_graceful_shutdown(async move {
shutdown_receiver.await.ok();
tracing::info!("Shutting down");
})
.await;
// Notify diagnostics endpoint // Notify diagnostics endpoint
if let Some(diagnostic_endpoint) = diagnostic_endpoint { if let Some(diagnostic_endpoint) = diagnostic_endpoint {
state.metrics.send(diagnostic_endpoint).await; state.metrics.send(diagnostic_endpoint).await;
} }
ret?;
Ok(()) Ok(())
} }