diff options
Diffstat (limited to 'src/garage')
| -rw-r--r-- | src/garage/cli.rs | 2 | ||||
| -rw-r--r-- | src/garage/main.rs | 3 | ||||
| -rw-r--r-- | src/garage/server.rs | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/garage/cli.rs b/src/garage/cli.rs index eb8275a9..55cd222b 100644 --- a/src/garage/cli.rs +++ b/src/garage/cli.rs @@ -80,7 +80,7 @@ pub struct ConfigureNodeOpt { #[structopt(short = "c", long = "capacity")] capacity: Option<u32>, - /// Optionnal node tag + /// Optional node tag #[structopt(short = "t", long = "tag")] tag: Option<String>, diff --git a/src/garage/main.rs b/src/garage/main.rs index 6c86d0fb..a78e0f03 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -1,4 +1,5 @@ #![recursion_limit = "1024"] +//! Garage CLI, used to interact with a running Garage instance, and to launch a Garage instance #[macro_use] extern crate log; @@ -25,7 +26,7 @@ use cli::*; #[derive(StructOpt, Debug)] #[structopt(name = "garage")] -pub struct Opt { +struct Opt { /// RPC connect to this host to execute client operations #[structopt(short = "h", long = "rpc-host", default_value = "127.0.0.1:3901")] pub rpc_host: SocketAddr, diff --git a/src/garage/server.rs b/src/garage/server.rs index feb858e4..97a9bec2 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -8,10 +8,10 @@ use garage_util::background::*; use garage_util::config::*; use garage_util::error::Error; -use garage_api::api_server; +use garage_api::run_api_server; use garage_model::garage::Garage; use garage_rpc::rpc_server::RpcServer; -use garage_web::web_server; +use garage_web::run_web_server; use crate::admin_rpc::*; @@ -62,8 +62,8 @@ 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, wait_from(watch_cancel.clone())); + let api_server = run_api_server(garage.clone(), wait_from(watch_cancel.clone())); + let web_server = run_web_server(garage, wait_from(watch_cancel.clone())); futures::try_join!( bootstrap.map(|rv| { |