Remove unneeded heartbeat logic with sketchy time addition (#2129)

* Remove unneeded heartbeat logic with sketchy time addition

Author: Natalie Davidson

src/commands/tail/api.rs

@@ -2,14 +2,11 @@ use crate::http;
 use crate::settings::global_user::GlobalUser;
 
 use anyhow::Result;
-use chrono::{DateTime, Utc};
 use cloudflare::{
-    endpoints::workers::{CreateTail, CreateTailParams, DeleteTail, SendTailHeartbeat},
+    endpoints::workers::{CreateTail, CreateTailParams, DeleteTail},
     framework::{async_api::ApiClient, response::ApiFailure},
 };
 use reqwest::StatusCode;
-use std::time::{SystemTime, UNIX_EPOCH};
-use tokio::time::{Duration, Instant};
 use url::Url;
 
 /// A tail captures `TraceEvent`s from a published Worker.
@@ -18,7 +15,6 @@ pub struct Tail {
     pub user: GlobalUser,
     pub account_id: String,
     pub script_name: String,
-    pub expires_at: Instant,
     pub url: Option<Url>,
     pub id: Option<String>,
 }
@@ -35,7 +31,6 @@ impl Tail {
             user,
             account_id,
             script_name,
-            expires_at: Instant::now(),
             url,
             id: None,
         }
@@ -68,7 +63,6 @@ impl Tail {
                     let tail = response.result;
                     log::info!("Created tail: {:?}", tail);
                     self.id = Some(tail.id);
-                    self.expires_at = to_instant(tail.expires_at);
                     self.url = Some(Url::parse(
                         &tail.url.expect("Expected a URL from tail response"),
                     )?);
@@ -82,35 +76,6 @@ impl Tail {
         }
     }
 
-    /// Sends a keep-alive to the tail.
-    pub async fn keep_alive(&mut self) -> Result<()> {
-        match self.id.clone() {
-            Some(tail_id) => {
-                match http::cf_v4_api_client_async(&self.user)?
-                    .request(&SendTailHeartbeat {
-                        account_identifier: &self.account_id,
-                        script_name: &self.script_name,
-                        tail_id: &tail_id,
-                    })
-                    .await
-                {
-                    Ok(response) => {
-                        log::debug!("Sent tail keep-alive tail: {:?}", response.result);
-                        self.expires_at = to_instant(response.result.expires_at);
-                        Ok(())
-                    }
-                    Err(err) => {
-                        anyhow::bail!(
-                            "Failed to keep-alive tail: {}",
-                            http::format_error(err, None)
-                        )
-                    }
-                }
-            }
-            _ => Ok(()),
-        }
-    }
-
     /// Deletes the tail and unattaches it from the Worker.
     pub async fn delete(&mut self) -> Result<()> {
         match self.id.clone() {
@@ -126,7 +91,6 @@ impl Tail {
                     log::info!("Deleted tail: {}", &tail_id);
                     self.id = None;
                     self.url = None;
-                    self.expires_at = Instant::now();
                     Ok(())
                 }
                 Err(err) => {
@@ -137,13 +101,3 @@ impl Tail {
         }
     }
 }
-
-/// Converts a `chrono::DateTime` into a `tokio::time::Instant`.
-fn to_instant(datetime: DateTime<Utc>) -> Instant {
-    let delta = datetime.timestamp()
-        - SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .expect("Time is going backwards?")
-            .as_secs() as i64;
-    Instant::now() + Duration::from_secs(delta as u64)
-}

src/commands/tail/mod.rs

@@ -74,13 +74,10 @@ pub async fn run(
             )
         ));
 
-        if let Err(err) = loop {
+        loop {
             tokio::select! {
-                _ = tokio::signal::ctrl_c() => break Ok(()),
-                _ = tokio::time::sleep_until(tail.expires_at) => if let Err(err) = tail.keep_alive().await { break Err(err) }
+                _ = tokio::signal::ctrl_c() => break
             }
-        } {
-            progress.abandon_with_message(&format!("{}", err));
         }
     }
 

src/commands/tail/websocket.rs

@@ -111,9 +111,6 @@ impl WebSocketTail {
             },
             _ = tokio::signal::ctrl_c() => {
                 self.close(CloseCode::Away, "wrangler is closing due to ctrl-c").await
-            },
-            _ = tokio::time::sleep_until(self.tail.expires_at) => {
-                self.close(CloseCode::Normal, "wrangler is closing due to expiration").await
             }
         }
     }