diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-10-03 18:40:37 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-10-03 18:40:37 +0200 |
| commit | 2e656b541b1dd1492798e1ed764fa40868da4d6a (patch) | |
| tree | 66fbf4c11a248d3c92cf44c4d3f18663670acbbe /src/api/s3/api_server.rs | |
| parent | 9ac1d5be0eba1b3b35f7fb2f99fe8df549044197 (diff) | |
| parent | 1243db87f2090a3302c7c8beb386e68ddf9b66b5 (diff) | |
| download | garage-2e656b541b1dd1492798e1ed764fa40868da4d6a.tar.gz garage-2e656b541b1dd1492798e1ed764fa40868da4d6a.zip | |
Merge branch 'main' into nextv0.9.0-rc1
Diffstat (limited to 'src/api/s3/api_server.rs')
| -rw-r--r-- | src/api/s3/api_server.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/s3/api_server.rs b/src/api/s3/api_server.rs index 3f995d34..d675ab61 100644 --- a/src/api/s3/api_server.rs +++ b/src/api/s3/api_server.rs @@ -1,4 +1,3 @@ -use std::net::SocketAddr; use std::sync::Arc; use async_trait::async_trait; @@ -10,6 +9,7 @@ use hyper::{Body, Request, Response}; use opentelemetry::{trace::SpanRef, KeyValue}; use garage_util::error::Error as GarageError; +use garage_util::socket_address::UnixOrTCPSocketAddress; use garage_model::garage::Garage; use garage_model::key_table::Key; @@ -46,12 +46,12 @@ pub(crate) struct S3ApiEndpoint { impl S3ApiServer { pub async fn run( garage: Arc<Garage>, - addr: SocketAddr, + addr: UnixOrTCPSocketAddress, s3_region: String, shutdown_signal: impl Future<Output = ()>, ) -> Result<(), GarageError> { ApiServer::new(s3_region, S3ApiServer { garage }) - .run_server(addr, shutdown_signal) + .run_server(addr, None, shutdown_signal) .await } |