diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-08 15:49:17 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-08 15:49:17 +0200 |
| commit | d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956 (patch) | |
| tree | 53429d4faa2e696dd798515e2db493bc78ba5e48 /src/api/k2v/api_server.rs | |
| parent | d23b3a14fc28de164080e762f0e97e6cbc868940 (diff) | |
| parent | 03c40a0b24dd5bd2a51d3cd3df0ca1a42fb2d328 (diff) | |
| download | garage-d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956.tar.gz garage-d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956.zip | |
Merge branch 'main' into lx-perf-improvements
Diffstat (limited to 'src/api/k2v/api_server.rs')
| -rw-r--r-- | src/api/k2v/api_server.rs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/api/k2v/api_server.rs b/src/api/k2v/api_server.rs index eb0fbdd7..084867b5 100644 --- a/src/api/k2v/api_server.rs +++ b/src/api/k2v/api_server.rs @@ -1,3 +1,4 @@ +use std::net::SocketAddr; use std::sync::Arc; use async_trait::async_trait; @@ -36,20 +37,13 @@ pub(crate) struct K2VApiEndpoint { impl K2VApiServer { pub async fn run( garage: Arc<Garage>, + bind_addr: SocketAddr, + s3_region: String, shutdown_signal: impl Future<Output = ()>, ) -> Result<(), GarageError> { - if let Some(cfg) = &garage.config.k2v_api { - let bind_addr = cfg.api_bind_addr; - - ApiServer::new( - garage.config.s3_api.s3_region.clone(), - K2VApiServer { garage }, - ) + ApiServer::new(s3_region, K2VApiServer { garage }) .run_server(bind_addr, shutdown_signal) .await - } else { - Ok(()) - } } } |