diff options
Diffstat (limited to 'crates/core/tedge_agent')
| -rw-r--r-- | crates/core/tedge_agent/src/agent.rs | 40 | ||||
| -rw-r--r-- | crates/core/tedge_agent/src/restart_operation_handler.rs | 2 | ||||
| -rw-r--r-- | crates/core/tedge_agent/src/state.rs | 4 |
3 files changed, 22 insertions, 24 deletions
diff --git a/crates/core/tedge_agent/src/agent.rs b/crates/core/tedge_agent/src/agent.rs index 69acdd40..bf8f2821 100644 --- a/crates/core/tedge_agent/src/agent.rs +++ b/crates/core/tedge_agent/src/agent.rs @@ -280,7 +280,7 @@ impl SmAgent { } }); - let () = self.process_pending_operation(&mut mqtt.published).await?; + self.process_pending_operation(&mut mqtt.published).await?; while let Err(error) = self .process_subscribed_messages(&mut mqtt.received, &mut mqtt.published, &plugins) @@ -320,8 +320,8 @@ impl SmAgent { } topic if topic == &self.config.request_topic_update => { - let () = plugins.lock().await.load()?; - let () = plugins + plugins.lock().await.load()?; + plugins .lock() .await .update_default(&get_default_plugin(&self.config.config_location)?)?; @@ -352,7 +352,7 @@ impl SmAgent { self.persistance_store.clear().await?; let status = OperationStatus::Failed; let response = RestartOperationResponse::new(&request).with_status(status); - let () = responses + responses .publish(Message::new( &self.config.response_topic_restart, response.to_bytes()?, @@ -377,8 +377,7 @@ impl SmAgent { ) -> Result<(), AgentError> { let request = match SoftwareListRequest::from_slice(message.payload_bytes()) { Ok(request) => { - let () = self - .persistance_store + self.persistance_store .store(&State { operation_id: Some(request.id.clone()), operation: Some(StateStatus::Software(SoftwareOperationVariants::List)), @@ -390,7 +389,7 @@ impl SmAgent { Err(error) => { debug!("Parsing error: {}", error); - let () = responses + responses .publish(Message::new( &self.config.errors_topic, format!("{}", error), @@ -405,7 +404,7 @@ impl SmAgent { }; let mut executing_response = SoftwareListResponse::new(&request); - let () = responses + responses .publish(Message::new( &self.config.response_topic_list, executing_response.to_bytes()?, @@ -425,7 +424,7 @@ impl SmAgent { } }; - let () = responses + responses .publish(Message::new(response_topic, response.to_bytes()?)) .await?; @@ -456,7 +455,7 @@ impl SmAgent { Err(error) => { error!("Parsing error: {}", error); - let () = responses + responses .publish(Message::new( &self.config.errors_topic, format!("{}", error), @@ -471,7 +470,7 @@ impl SmAgent { }; let mut executing_response = SoftwareUpdateResponse::new(&request); - let () = responses + responses .publish(Message::new(response_topic, executing_response.to_bytes()?)) .await?; @@ -494,7 +493,7 @@ impl SmAgent { } }; - let () = responses + responses .publish(Message::new(response_topic, response.to_bytes()?)) .await?; @@ -510,8 +509,7 @@ impl SmAgent { ) -> Result<RestartOperationRequest, AgentError> { let request = match RestartOperationRequest::from_slice(message.payload_bytes()) { Ok(request) => { - let () = self - .persistance_store + self.persistance_store .store(&State { operation_id: Some(request.id.clone()), operation: Some(StateStatus::Restart(RestartOperationStatus::Restarting)), @@ -522,7 +520,7 @@ impl SmAgent { Err(error) => { error!("Parsing error: {}", error); - let () = responses + responses .publish(Message::new( &self.config.errors_topic, format!("{}", error), @@ -549,10 +547,10 @@ impl SmAgent { // update status to executing. let executing_response = RestartOperationResponse::new(&RestartOperationRequest::default()); - let () = responses + responses .publish(Message::new(topic, executing_response.to_bytes()?)) .await?; - let () = restart_operation::create_slash_run_file(&self.config.run_dir)?; + restart_operation::create_slash_run_file(&self.config.run_dir)?; let command_vec = get_restart_operation_commands(); for mut command in command_vec { @@ -618,7 +616,7 @@ impl SmAgent { let response = SoftwareRequestResponse::new(&id, status); - let () = responses + responses .publish(Message::new(topic, response.to_bytes()?)) .await?; } @@ -689,7 +687,7 @@ mod tests { let (_output, mut output_stream) = mqtt_tests::output_stream(); let response_topic_restart = Topic::new(RestartOperationResponse::topic_name()).expect("Invalid topic"); - let () = agent + agent .handle_restart_operation(&mut output_stream, &response_topic_restart) .await?; assert!(std::path::Path::new( @@ -765,7 +763,7 @@ mod tests { ) .unwrap(), )); - let () = agent + agent .handle_software_list_request( &mut output_sink, plugins, @@ -809,7 +807,7 @@ mod tests { ) .unwrap(), )); - let () = agent + agent .process_subscribed_messages(&mut requests, &mut response_sink, &plugins) .await .unwrap(); diff --git a/crates/core/tedge_agent/src/restart_operation_handler.rs b/crates/core/tedge_agent/src/restart_operation_handler.rs index 29342cb0..e6db967f 100644 --- a/crates/core/tedge_agent/src/restart_operation_handler.rs +++ b/crates/core/tedge_agent/src/restart_operation_handler.rs @@ -12,7 +12,7 @@ pub mod restart_operation { /// /// # Example /// ``` - /// let () = RestartOperationHelper::create_slash_run_file()?; + /// RestartOperationHelper::create_slash_run_file()?; /// ``` pub fn create_slash_run_file(run_dir: &Path) -> Result<(), AgentError> { let path = &run_dir.join(SLASH_RUN_PATH_TEDGE_AGENT_RESTART); diff --git a/crates/core/tedge_agent/src/state.rs b/crates/core/tedge_agent/src/state.rs index 36b378dd..7f482822 100644 --- a/crates/core/tedge_agent/src/state.rs +++ b/crates/core/tedge_agent/src/state.rs @@ -41,7 +41,7 @@ impl StateRepository for AgentStateRepository { // Create in path given through `config-dir` or `/etc/tedge` directory in case it does not exist yet if !self.state_repo_root.exists() { - let () = fs::create_dir(&self.state_repo_root).await?; + fs::create_dir(&self.state_repo_root).await?; } let mut temppath = self.state_repo_path.clone(); @@ -58,7 +58,7 @@ impl StateRepository for AgentStateRepository { operation_id: None, operation: None, }; - let () = self.store(&state).await?; + self.store(&state).await?; Ok(state) } |