refactor: cancelled functions names

Author: danielorihuela

agent-control/src/event/cancellation.rs

@@ -5,23 +5,23 @@ use std::time::Duration;
 pub type CancellationMessage = ();
 
 impl EventConsumer<CancellationMessage> {
+    /// Checks whether the consumer is cancelled immediately.
+    ///
+    /// Calls [`Self::is_cancelled`] with a timeout of zero.
+    pub fn is_cancelled(&self) -> bool {
+        self.is_cancelled_with_timeout(Duration::ZERO)
+    }
+
     /// Checks whether the consumer is cancelled for the given timeout.
     ///
     /// It returns true if the consumer received a cancellation message or received an error
     /// before the provided timeout is elapsed. Otherwise it blocks until the timeout is elapsed
     /// and returns false.
-    pub fn is_cancelled(&self, timeout: Duration) -> bool {
+    pub fn is_cancelled_with_timeout(&self, timeout: Duration) -> bool {
         match self.as_ref().recv_timeout(timeout) {
             Ok(_) => true,
             Err(RecvTimeoutError::Timeout) => false,
             Err(RecvTimeoutError::Disconnected) => true,
         }
     }
-
-    /// Checks whether the consumer is cancelled immediately.
-    ///
-    /// Calls [`Self::is_cancelled`] with a timeout of zero.
-    pub fn is_cancelled_immediately(&self) -> bool {
-        self.is_cancelled(Duration::ZERO)
-    }
 }

agent-control/src/health/health_checker.rs

@@ -311,7 +311,7 @@ where
             event_publisher.publish_health_event(health);
 
             // Check the cancellation signal
-            if stop_consumer.is_cancelled(interval.into()) {
+            if stop_consumer.is_cancelled_with_timeout(interval.into()) {
                 break;
             }
         }

agent-control/src/sub_agent/k8s/supervisor.rs

@@ -147,7 +147,7 @@ impl NotStartedSupervisorK8s {
             }
 
             // Check the cancellation signal
-            if stop_consumer.is_cancelled(interval) {
+            if stop_consumer.is_cancelled_with_timeout(interval) {
                 break;
             }
         };

agent-control/src/sub_agent/on_host/supervisor.rs

@@ -217,7 +217,7 @@ impl NotStartedSupervisorOnHost {
                     if let Some(pid) = *current_pid_clone.lock().unwrap() {
                         info!(pid = pid, msg = "Stopping executable");
                         _ = ProcessTerminator::new(pid)
-                            .shutdown(|| process_finished_consumer.is_cancelled(Duration::new(10, 0)));
+                            .shutdown(|| process_finished_consumer.is_cancelled_with_timeout(Duration::new(10, 0)));
                     } else {
                         info!(msg = "Executable not running");
                     }
@@ -246,7 +246,7 @@ impl NotStartedSupervisorOnHost {
                     info_span!("start_executable", { ID_ATTRIBUTE_NAME } = %agent_id, exec_id)
                         .entered();
 
-                if kill_process_consumer.is_cancelled_immediately() {
+                if kill_process_consumer.is_cancelled() {
                     debug!("Supervisor stopped before starting executable");
                     break;
                 }
@@ -310,7 +310,7 @@ impl NotStartedSupervisorOnHost {
                     }
                 };
 
-                if kill_process_consumer.is_cancelled_immediately() {
+                if kill_process_consumer.is_cancelled() {
                     info!(supervisor = bin, msg = "Executable terminated");
                     break;
                 }
@@ -346,7 +346,7 @@ impl NotStartedSupervisorOnHost {
 
                 restart_policy.backoff(|duration| {
                     // early exit if supervisor timeout is canceled
-                    kill_process_consumer.is_cancelled(duration);
+                    kill_process_consumer.is_cancelled_with_timeout(duration);
                 });
                 i += 1;
 

agent-control/src/utils/thread_context.rs

@@ -165,7 +165,7 @@ pub mod tests {
     fn test_thread_context_start_stop_blocking() {
         let thread_name = "test-thread";
         let callback = |stop_consumer: EventConsumer<CancellationMessage>| loop {
-            if stop_consumer.is_cancelled(Duration::default()) {
+            if stop_consumer.is_cancelled_with_timeout(Duration::default()) {
                 break;
             }
         };

agent-control/src/version_checker/k8s/checkers.rs

@@ -153,7 +153,7 @@ where
             }
         }
 
-        if stop_consumer.is_cancelled(interval.into()) {
+        if stop_consumer.is_cancelled_with_timeout(interval.into()) {
             break;
         }
     };