cleanup(grpc): simplify Backoff creation

Author: Molter73

fact/src/output/grpc.rs

@@ -18,7 +18,11 @@ use tokio_stream::{
 };
 use tonic::transport::Channel;
 
-use crate::{config::GrpcConfig, event::Event, metrics::EventCounter};
+use crate::{
+    config::{BackoffConfig, GrpcConfig},
+    event::Event,
+    metrics::EventCounter,
+};
 
 struct Backoff {
     initial: Duration,
@@ -46,6 +50,12 @@ impl Backoff {
     }
 }
 
+impl From<&BackoffConfig> for Backoff {
+    fn from(value: &BackoffConfig) -> Self {
+        Backoff::new(value.initial(), value.max())
+    }
+}
+
 pub struct Client {
     rx: broadcast::Receiver<Arc<Event>>,
     running: watch::Receiver<bool>,
@@ -148,8 +158,7 @@ impl Client {
 
     async fn run(&mut self) -> anyhow::Result<bool> {
         let connector = self.get_connector().await?;
-        let backoff_config = self.config.borrow().backoff.clone();
-        let mut backoff = Backoff::new(backoff_config.initial(), backoff_config.max());
+        let mut backoff = Backoff::from(&self.config.borrow().backoff);
         loop {
             info!("Attempting to connect to gRPC server...");
             let channel = match self.create_channel(connector.clone()).await {
@@ -187,9 +196,6 @@ impl Client {
                         Ok(_) => info!("gRPC stream ended"),
                         Err(e) => warn!("gRPC stream error: {e:?}"),
                     }
-                    let delay = backoff.next();
-                    warn!("Reconnecting in {delay:?}...");
-                    sleep(delay).await;
                 }
                 _ = self.config.changed() => return Ok(true),
                 _ = self.running.changed() => return Ok(*self.running.borrow()),
@@ -235,9 +241,9 @@ mod tests {
     #[test]
     fn backoff_reset() {
         let mut b = Backoff::new(Duration::from_secs(1), Duration::from_secs(60));
-        b.next();
-        b.next();
-        b.next();
+        assert_eq!(b.next(), Duration::from_secs(1));
+        assert_eq!(b.next(), Duration::from_secs(2));
+        assert_eq!(b.next(), Duration::from_secs(4));
         b.reset();
         assert_eq!(b.next(), Duration::from_secs(1));
         assert_eq!(b.next(), Duration::from_secs(2));