aboutsummaryrefslogtreecommitdiff
path: root/src/api/s3/api_server.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2024-02-08 23:43:59 +0100
committerAlex Auvolat <alex@adnab.me>2024-02-08 23:43:59 +0100
commit5c63193d1de909cdecc501b482f5dc269a84874d (patch)
treecf34b848df170b3e3289754c77c4a9f61b97a260 /src/api/s3/api_server.rs
parentbcbd15da84181ad94ece7e794933a6ebd388f5bc (diff)
downloadgarage-5c63193d1de909cdecc501b482f5dc269a84874d.tar.gz
garage-5c63193d1de909cdecc501b482f5dc269a84874d.zip
[dep-upgrade-202402] fix shutdown issue introduced when upgrading hyperdep-upgrade-202402
Diffstat (limited to 'src/api/s3/api_server.rs')
-rw-r--r--src/api/s3/api_server.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/s3/api_server.rs b/src/api/s3/api_server.rs
index 495c5832..4b815f79 100644
--- a/src/api/s3/api_server.rs
+++ b/src/api/s3/api_server.rs
@@ -2,9 +2,9 @@ use std::sync::Arc;
use async_trait::async_trait;
-use futures::future::Future;
use hyper::header;
use hyper::{body::Incoming as IncomingBody, Request, Response};
+use tokio::sync::watch;
use opentelemetry::{trace::SpanRef, KeyValue};
@@ -51,10 +51,10 @@ impl S3ApiServer {
garage: Arc<Garage>,
addr: UnixOrTCPSocketAddress,
s3_region: String,
- shutdown_signal: impl Future<Output = ()>,
+ must_exit: watch::Receiver<bool>,
) -> Result<(), GarageError> {
ApiServer::new(s3_region, S3ApiServer { garage })
- .run_server(addr, None, shutdown_signal)
+ .run_server(addr, None, must_exit)
.await
}