Merge branch 'main' into ui-basic-auth

Author: serprex

docker-compose-dev.yml

@@ -173,6 +173,7 @@ services:
 
   peerdb:
     container_name: peerdb-server
+    stop_signal: SIGINT
     build:
       context: .
       dockerfile: stacks/peerdb-server.Dockerfile

docker-compose.yml

@@ -145,6 +145,7 @@ services:
 
   peerdb:
     container_name: peerdb-server
+    stop_signal: SIGINT
     image: ghcr.io/peerdb-io/peerdb-server:latest-dev
     environment:
       <<: *catalog-config

nexus/server/src/main.rs

@@ -40,6 +40,7 @@ use pt::{
     peerdb_peers::{peer::Config, Peer},
 };
 use rand::Rng;
+use tokio::signal::unix::{signal, SignalKind};
 use tokio::sync::{Mutex, MutexGuard};
 use tokio::{io::AsyncWriteExt, net::TcpListener};
 use tracing_appender::non_blocking::WorkerGuard;
@@ -1371,8 +1372,13 @@ pub async fn main() -> anyhow::Result<()> {
         None
     };
 
+    let mut sigintstream = signal(SignalKind::interrupt()).expect("Failed to setup signal handler");
     loop {
-        let (mut socket, _) = listener.accept().await.unwrap();
+        let (mut socket, _) = tokio::select! {
+            _ = sigintstream.recv() => return Ok(()),
+            v = listener.accept() => v,
+        }
+        .unwrap();
         let catalog = match Catalog::new(&catalog_config).await {
             Ok(c) => c,
             Err(e) => {