diff options
| author | Alex <alex@adnab.me> | 2024-02-07 14:59:40 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-02-07 14:59:40 +0000 |
| commit | 5d941e0100489fff552b59f0679a2a010403a21c (patch) | |
| tree | 5c5cef9af72d48dd7347922341e43f0013380c60 /src/garage/server.rs | |
| parent | feeb076b7f5db7fe6fdbe3d2903fae054cde6219 (diff) | |
| parent | e011941964b1c1e0b90f85014d166d64a83ae8e2 (diff) | |
| download | garage-5d941e0100489fff552b59f0679a2a010403a21c.tar.gz garage-5d941e0100489fff552b59f0679a2a010403a21c.zip | |
Merge pull request 'Dependency upgrades: http, hyper, aws-sdk, smaller deps' (#703) from dep-upgrade-202402 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/703
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index ac76a44d..de8ac9e2 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -113,12 +113,11 @@ pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Er if let Some(web_config) = &config.s3_web { info!("Initializing web server..."); + let web_server = WebServer::new(garage.clone(), web_config.root_domain.clone()); servers.push(( "Web", - tokio::spawn(WebServer::run( - garage.clone(), + tokio::spawn(web_server.run( web_config.bind_addr.clone(), - web_config.root_domain.clone(), wait_from(watch_cancel.clone()), )), )); |