diff options
| author | Alex <alex@adnab.me> | 2023-10-03 16:23:02 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-10-03 16:23:02 +0000 |
| commit | 1243db87f2090a3302c7c8beb386e68ddf9b66b5 (patch) | |
| tree | 7280b64fd8ef63be32f27f44f26f0ee7c8ca44be /src/api/s3 | |
| parent | 16aa418e473a5e9ef229060d20f6eb280df272a2 (diff) | |
| parent | 6f8a87814be502ecaee49cd37616ec7fe4c5b588 (diff) | |
| download | garage-1243db87f2090a3302c7c8beb386e68ddf9b66b5.tar.gz garage-1243db87f2090a3302c7c8beb386e68ddf9b66b5.zip | |
Merge pull request 'Add support for binding to unix domain sockets' (#640) from networkException/garage:unix-sockets into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/640
Diffstat (limited to 'src/api/s3')
| -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 27837297..ecfb48b6 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; @@ -44,12 +44,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 } |