diff options
| author | Alex <alex@adnab.me> | 2021-01-15 17:49:49 +0100 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2021-01-15 17:49:49 +0100 |
| commit | 97494b4a190cb16986b743ba1446968a6c180c6e (patch) | |
| tree | 81edd9c3fab766e83ba8d8bba962aa68e1b911c3 /src/garage/server.rs | |
| parent | 8956db2a81c3700b62c5208cff2ca4b0b124c328 (diff) | |
| parent | 851893a3f299da9eeb0ef3c745be1f30164fd6cf (diff) | |
| download | garage-97494b4a190cb16986b743ba1446968a6c180c6e.tar.gz garage-97494b4a190cb16986b743ba1446968a6c180c6e.zip | |
Merge pull request 'Support website publishing' (#7) from feature/website into master
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/7
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index 6caea5eb..ec78c067 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -11,6 +11,7 @@ use garage_util::error::Error; use garage_api::api_server; use garage_model::garage::Garage; use garage_rpc::rpc_server::RpcServer; +use garage_web::web_server; use crate::admin_rpc::*; @@ -56,6 +57,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { info!("Initializing RPC and API servers..."); let run_rpc_server = Arc::new(rpc_server).run(wait_from(watch_cancel.clone())); let api_server = api_server::run_api_server(garage.clone(), wait_from(watch_cancel.clone())); + let web_server = web_server::run_web_server(garage.clone(), wait_from(watch_cancel.clone())); futures::try_join!( garage @@ -78,6 +80,10 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { info!("API server exited"); rv }), + web_server.map(|rv| { + info!("Web server exited"); + rv + }), background.run().map(|rv| { info!("Background runner exited"); Ok(rv) |