diff --git a/src/agent/src/config.rs b/src/agent/src/config.rs index 2c53bde20..1fd634576 100644 --- a/src/agent/src/config.rs +++ b/src/agent/src/config.rs @@ -225,10 +225,9 @@ fn get_bool_value(param: &str) -> Result { // first try to parse as bool value v.parse::().or_else(|_err1| { // then try to parse as integer value - v.parse::().or_else(|_err2| Ok(0)).map(|v| match v { - 0 => false, - _ => true, - }) + v.parse::() + .or_else(|_err2| Ok(0)) + .map(|v| !matches!(v, 0)) }) } diff --git a/src/agent/src/rpc.rs b/src/agent/src/rpc.rs index 747a0433f..03af6d890 100644 --- a/src/agent/src/rpc.rs +++ b/src/agent/src/rpc.rs @@ -1203,7 +1203,7 @@ impl protocols::agent_ttrpc::AgentService for agentService { drop(sandbox); match event_rx.recv() { - Err(err) => return Err(ttrpc_error(ttrpc::Code::INTERNAL, err.to_string())), + Err(err) => Err(ttrpc_error(ttrpc::Code::INTERNAL, err.to_string())), Ok(container_id) => { info!(sl!(), "get_oom_event return {}", &container_id); let mut resp = OOMEvent::new(); @@ -1327,7 +1327,7 @@ fn read_stream(fd: RawFd, l: usize) -> Result> { } Err(e) => match e { nix::Error::Sys(errno) => match errno { - Errno::EAGAIN => v.resize(0, 0), + Errno::EAGAIN => v.clear(), _ => return Err(anyhow!(nix::Error::Sys(errno))), }, _ => return Err(anyhow!("read error")),