tools: Log request in agent-ctl tool if debug enabled

Display the API request before making the call so users can see what is
sent to the agent.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2020-10-15 17:13:08 +01:00 committed by Peng Tao
parent 0c432153df
commit 81fb2c9980

View File

@ -684,6 +684,8 @@ fn agent_cmd_health_check(
// value unused // value unused
req.set_service("".to_string()); req.set_service("".to_string());
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = health let reply = health
.check(&req, cfg.timeout_nano) .check(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -707,6 +709,8 @@ fn agent_cmd_health_version(
// value unused // value unused
req.set_service("".to_string()); req.set_service("".to_string());
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = health let reply = health
.version(&req, cfg.timeout_nano) .version(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -729,6 +733,8 @@ fn agent_cmd_sandbox_create(
let sid = utils::get_option("sid", options, args); let sid = utils::get_option("sid", options, args);
req.set_sandbox_id(sid); req.set_sandbox_id(sid);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.create_sandbox(&req, cfg.timeout_nano) .create_sandbox(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -748,6 +754,8 @@ fn agent_cmd_sandbox_destroy(
) -> Result<()> { ) -> Result<()> {
let req = DestroySandboxRequest::default(); let req = DestroySandboxRequest::default();
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.destroy_sandbox(&req, cfg.timeout_nano) .destroy_sandbox(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -778,6 +786,8 @@ fn agent_cmd_container_create(
req.set_exec_id(exec_id); req.set_exec_id(exec_id);
req.set_OCI(grpc_spec); req.set_OCI(grpc_spec);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.create_container(&req, cfg.timeout_nano) .create_container(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -801,6 +811,8 @@ fn agent_cmd_container_remove(
req.set_container_id(cid); req.set_container_id(cid);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.remove_container(&req, cfg.timeout_nano) .remove_container(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -838,6 +850,8 @@ fn agent_cmd_container_exec(
req.set_exec_id(exec_id); req.set_exec_id(exec_id);
req.set_process(process); req.set_process(process);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.exec_process(&req, cfg.timeout_nano) .exec_process(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -861,6 +875,8 @@ fn agent_cmd_container_stats(
req.set_container_id(cid); req.set_container_id(cid);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.stats_container(&req, cfg.timeout_nano) .stats_container(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -884,6 +900,8 @@ fn agent_cmd_container_pause(
req.set_container_id(cid); req.set_container_id(cid);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.pause_container(&req, cfg.timeout_nano) .pause_container(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -907,6 +925,8 @@ fn agent_cmd_container_resume(
req.set_container_id(cid); req.set_container_id(cid);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.resume_container(&req, cfg.timeout_nano) .resume_container(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -930,6 +950,8 @@ fn agent_cmd_container_start(
req.set_container_id(cid); req.set_container_id(cid);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.start_container(&req, cfg.timeout_nano) .start_container(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -951,6 +973,8 @@ fn agent_cmd_sandbox_get_guest_details(
req.set_mem_block_size(true); req.set_mem_block_size(true);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.get_guest_details(&req, cfg.timeout_nano) .get_guest_details(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -981,6 +1005,8 @@ fn agent_cmd_container_list_processes(
req.set_container_id(cid); req.set_container_id(cid);
req.set_format(list_format); req.set_format(list_format);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.list_processes(&req, cfg.timeout_nano) .list_processes(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -1006,6 +1032,8 @@ fn agent_cmd_container_wait_process(
req.set_container_id(cid); req.set_container_id(cid);
req.set_exec_id(exec_id); req.set_exec_id(exec_id);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.wait_process(&req, cfg.timeout_nano) .wait_process(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -1041,6 +1069,8 @@ fn agent_cmd_container_signal_process(
req.set_exec_id(exec_id); req.set_exec_id(exec_id);
req.set_signal(signum as u32); req.set_signal(signum as u32);
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.signal_process(&req, cfg.timeout_nano) .signal_process(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -1060,6 +1090,8 @@ fn agent_cmd_sandbox_tracing_start(
) -> Result<()> { ) -> Result<()> {
let req = StartTracingRequest::default(); let req = StartTracingRequest::default();
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.start_tracing(&req, cfg.timeout_nano) .start_tracing(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -1079,6 +1111,8 @@ fn agent_cmd_sandbox_tracing_stop(
) -> Result<()> { ) -> Result<()> {
let req = StopTracingRequest::default(); let req = StopTracingRequest::default();
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.stop_tracing(&req, cfg.timeout_nano) .stop_tracing(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -1098,6 +1132,7 @@ fn agent_cmd_sandbox_update_interface(
) -> Result<()> { ) -> Result<()> {
let req = UpdateInterfaceRequest::default(); let req = UpdateInterfaceRequest::default();
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.update_interface(&req, cfg.timeout_nano) .update_interface(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -1123,6 +1158,8 @@ fn agent_cmd_sandbox_update_routes(
) -> Result<()> { ) -> Result<()> {
let req = UpdateRoutesRequest::default(); let req = UpdateRoutesRequest::default();
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.update_routes(&req, cfg.timeout_nano) .update_routes(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -1148,6 +1185,8 @@ fn agent_cmd_sandbox_list_interfaces(
) -> Result<()> { ) -> Result<()> {
let req = ListInterfacesRequest::default(); let req = ListInterfacesRequest::default();
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.list_interfaces(&req, cfg.timeout_nano) .list_interfaces(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
@ -1167,6 +1206,8 @@ fn agent_cmd_sandbox_list_routes(
) -> Result<()> { ) -> Result<()> {
let req = ListRoutesRequest::default(); let req = ListRoutesRequest::default();
debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
let reply = client let reply = client
.list_routes(&req, cfg.timeout_nano) .list_routes(&req, cfg.timeout_nano)
.map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?; .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;