diff options
Diffstat (limited to 'src/garage')
| -rw-r--r-- | src/garage/admin_rpc.rs | 6 | ||||
| -rw-r--r-- | src/garage/cli.rs | 3 | ||||
| -rw-r--r-- | src/garage/main.rs | 7 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/garage/admin_rpc.rs b/src/garage/admin_rpc.rs index 339d5bdb..b5fc9a7e 100644 --- a/src/garage/admin_rpc.rs +++ b/src/garage/admin_rpc.rs @@ -349,11 +349,7 @@ impl AdminRpcHandler { PRIO_NORMAL, ) .await; - let is_err = match resp { - Ok(Ok(_)) => false, - _ => true, - }; - if is_err { + if !matches!(resp, Ok(Ok(_))) { failures.push(node); } } diff --git a/src/garage/cli.rs b/src/garage/cli.rs index 3f3a255f..63bb506a 100644 --- a/src/garage/cli.rs +++ b/src/garage/cli.rs @@ -5,7 +5,6 @@ use structopt::StructOpt; use garage_util::data::Uuid; use garage_util::error::Error; -use garage_util::time::*; use garage_rpc::ring::*; use garage_rpc::system::*; @@ -400,7 +399,7 @@ pub async fn cmd_status(rpc_cli: &Endpoint<SystemRpc, ()>, rpc_host: NodeID) -> tag = cfg.tag, zone = cfg.zone, capacity = cfg.capacity_string(), - last_seen = (now_msec() - 0) / 1000, + last_seen = "FIXME", // FIXME was (now_msec() - adv.last_seen) / 1000, )); } } diff --git a/src/garage/main.rs b/src/garage/main.rs index c4f75348..57767df1 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -145,12 +145,12 @@ fn node_id_command(config_file: PathBuf, quiet: bool) -> Result<(), Error> { }; if !quiet { - eprintln!(""); + eprintln!(); eprintln!( "To instruct a node to connect to this node, run the following command on that node:" ); eprintln!(" garage [-c <config file path>] node connect {}", idstr); - eprintln!(""); + eprintln!(); eprintln!("Or instruct them to connect from here by running:"); eprintln!( " garage -c {} -h <remote node> node connect {}", @@ -160,12 +160,13 @@ fn node_id_command(config_file: PathBuf, quiet: bool) -> Result<(), Error> { eprintln!( "where <remote_node> is their own node identifier in the format: <pubkey>@<ip>:<port>" ); - eprintln!(""); + eprintln!(); eprintln!("This node identifier can also be added as a bootstrap node in other node's garage.toml files:"); eprintln!(" bootstrap_peers = ["); eprintln!(" \"{}\",", idstr); eprintln!(" ..."); eprintln!(" ]"); + eprintln!(); } Ok(()) |