diff options
| author | Alex <alex@adnab.me> | 2024-02-09 09:32:54 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-02-09 09:32:54 +0000 |
| commit | e4a43bfd592c149af8e3eac58ab317a518f0968a (patch) | |
| tree | cf34b848df170b3e3289754c77c4a9f61b97a260 /src/garage/server.rs | |
| parent | 8061bf5e1c250ff9234894f7a63910fedef1357b (diff) | |
| parent | 5c63193d1de909cdecc501b482f5dc269a84874d (diff) | |
| download | garage-e4a43bfd592c149af8e3eac58ab317a518f0968a.tar.gz garage-e4a43bfd592c149af8e3eac58ab317a518f0968a.zip | |
Merge pull request 'Upgrade toml, kube, k8s-openapi + code fixes' (#709) from dep-upgrade-202402 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/709
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index de8ac9e2..51b06b8e 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -88,7 +88,7 @@ pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Er garage.clone(), s3_bind_addr.clone(), config.s3_api.s3_region.clone(), - wait_from(watch_cancel.clone()), + watch_cancel.clone(), )), )); } @@ -103,7 +103,7 @@ pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Er garage.clone(), config.k2v_api.as_ref().unwrap().api_bind_addr.clone(), config.s3_api.s3_region.clone(), - wait_from(watch_cancel.clone()), + watch_cancel.clone(), )), )); } @@ -116,10 +116,7 @@ pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Er let web_server = WebServer::new(garage.clone(), web_config.root_domain.clone()); servers.push(( "Web", - tokio::spawn(web_server.run( - web_config.bind_addr.clone(), - wait_from(watch_cancel.clone()), - )), + tokio::spawn(web_server.run(web_config.bind_addr.clone(), watch_cancel.clone())), )); } @@ -127,9 +124,7 @@ pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Er info!("Launching Admin API server..."); servers.push(( "Admin", - tokio::spawn( - admin_server.run(admin_bind_addr.clone(), wait_from(watch_cancel.clone())), - ), + tokio::spawn(admin_server.run(admin_bind_addr.clone(), watch_cancel.clone())), )); } |