diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-11-02 15:48:39 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-11-02 15:48:39 +0100 |
| commit | cea871d944e36222f5fdabe3e907cb8cf86d26e8 (patch) | |
| tree | a2928e83176e21f19fe9dc319c6753677742cb4a /src/garage/server.rs | |
| parent | 104e2ce0a25917dfaaab7e62042cc611fc05125a (diff) | |
| download | garage-cea871d944e36222f5fdabe3e907cb8cf86d26e8.tar.gz garage-cea871d944e36222f5fdabe3e907cb8cf86d26e8.zip | |
Skeleton to the new web API
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..8962a8da 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -9,6 +9,7 @@ use garage_util::config::*; use garage_util::error::Error; use garage_api::api_server; +use garage_web::web_server; use garage_model::garage::Garage; use garage_rpc::rpc_server::RpcServer; @@ -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) |