From cea871d944e36222f5fdabe3e907cb8cf86d26e8 Mon Sep 17 00:00:00 2001 From: Quentin Date: Mon, 2 Nov 2020 15:48:39 +0100 Subject: Skeleton to the new web API --- src/garage/server.rs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/garage/server.rs') 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) -- cgit v1.2.3 From 27795a390ced369a5fda353c046cdd4b7ca98bd0 Mon Sep 17 00:00:00 2001 From: Quentin Date: Tue, 10 Nov 2020 09:59:52 +0100 Subject: Fix formatting --- src/garage/server.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/garage/server.rs') diff --git a/src/garage/server.rs b/src/garage/server.rs index 8962a8da..ec78c067 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -9,9 +9,9 @@ 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; +use garage_web::web_server; use crate::admin_rpc::*; -- cgit v1.2.3