diff options
| author | Alex Auvolat <lx@deuxfleurs.fr> | 2025-01-30 16:17:35 +0100 |
|---|---|---|
| committer | Alex Auvolat <lx@deuxfleurs.fr> | 2025-01-30 16:17:35 +0100 |
| commit | ebc0e9319e8e0f8d77eb538d8d0356189597acaa (patch) | |
| tree | 51a5398a79062e091a3516434178f899ddc2f2c3 /src | |
| parent | f8c6a8373d630311a18e9af011724181be68e5e1 (diff) | |
| download | garage-ebc0e9319e8e0f8d77eb538d8d0356189597acaa.tar.gz garage-ebc0e9319e8e0f8d77eb538d8d0356189597acaa.zip | |
cli_v2: error messages
Diffstat (limited to 'src')
| -rw-r--r-- | src/garage/cli_v2/mod.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/garage/cli_v2/mod.rs b/src/garage/cli_v2/mod.rs index e6d2d8c6..b51ed67f 100644 --- a/src/garage/cli_v2/mod.rs +++ b/src/garage/cli_v2/mod.rs @@ -47,11 +47,11 @@ impl Cli { AdminRpc::LaunchRepair(ro), ) .await - .ok_or_message("xoxo"), + .ok_or_message("cli_v1"), Command::Stats(so) => { cli_v1::cmd_admin(&self.admin_rpc_endpoint, self.rpc_host, AdminRpc::Stats(so)) .await - .ok_or_message("xoxo") + .ok_or_message("cli_v1") } Command::Worker(wo) => cli_v1::cmd_admin( &self.admin_rpc_endpoint, @@ -59,21 +59,21 @@ impl Cli { AdminRpc::Worker(wo), ) .await - .ok_or_message("xoxo"), + .ok_or_message("cli_v1"), Command::Block(bo) => cli_v1::cmd_admin( &self.admin_rpc_endpoint, self.rpc_host, AdminRpc::BlockOperation(bo), ) .await - .ok_or_message("xoxo"), + .ok_or_message("cli_v1"), Command::Meta(mo) => cli_v1::cmd_admin( &self.admin_rpc_endpoint, self.rpc_host, AdminRpc::MetaOperation(mo), ) .await - .ok_or_message("xoxo"), + .ok_or_message("cli_v1"), _ => unreachable!(), } @@ -91,7 +91,7 @@ impl Cli { .admin_rpc_endpoint .call(&self.rpc_host, AdminRpc::ApiRequest(req), PRIO_NORMAL) .await? - .ok_or_message("xoxo")? + .ok_or_message("rpc")? { AdminRpc::ApiOkResponse(resp) => <T as AdminApiEndpoint>::Response::try_from(resp) .map_err(|_| Error::Message(format!("{} returned unexpected response", req_name))), |