From 813532d57c4141b07cbffae759b1c3767f1c11f3 Mon Sep 17 00:00:00 2001 From: MasterPtato Date: Thu, 23 Apr 2026 11:04:07 -0700 Subject: [PATCH] chore: move code --- engine/packages/datacenter/src/workflows/ping.rs | 6 ++---- engine/packages/pegboard-runner/src/lib.rs | 9 +-------- engine/packages/pegboard-runner/src/ping_task.rs | 3 ++- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/engine/packages/datacenter/src/workflows/ping.rs b/engine/packages/datacenter/src/workflows/ping.rs index 4071151316..4638f6371d 100644 --- a/engine/packages/datacenter/src/workflows/ping.rs +++ b/engine/packages/datacenter/src/workflows/ping.rs @@ -71,6 +71,7 @@ async fn record_ping( ) -> Result<()> { let peer_url = dc.peer_url.join("/health")?; let start = Instant::now(); + let now = util::timestamp::now(); let peer_res = client .get(peer_url) @@ -88,10 +89,7 @@ async fn record_ping( .run(|tx| async move { let tx = tx.with_subspace(keys::subspace()); - tx.write( - &keys::LastPingTsKey::new(dc.datacenter_label), - util::timestamp::now(), - )?; + tx.write(&keys::LastPingTsKey::new(dc.datacenter_label), now)?; tx.write(&keys::LastRttKey::new(dc.datacenter_label), rtt)?; Ok(()) diff --git a/engine/packages/pegboard-runner/src/lib.rs b/engine/packages/pegboard-runner/src/lib.rs index fcd7a7f649..70d4669c82 100644 --- a/engine/packages/pegboard-runner/src/lib.rs +++ b/engine/packages/pegboard-runner/src/lib.rs @@ -161,14 +161,7 @@ impl CustomServeTrait for PegboardRunnerWsCustomServe { )); // Update pings - let update_ping_interval = - Duration::from_millis(ctx.config().pegboard().runner_update_ping_interval_ms()); - let ping = tokio::spawn(ping_task::task( - ctx.clone(), - conn.clone(), - ping_abort_rx, - update_ping_interval, - )); + let ping = tokio::spawn(ping_task::task(ctx.clone(), conn.clone(), ping_abort_rx)); let tunnel_to_ws_abort_tx2 = tunnel_to_ws_abort_tx.clone(); let ws_to_tunnel_abort_tx2 = ws_to_tunnel_abort_tx.clone(); let ping_abort_tx2 = ping_abort_tx.clone(); diff --git a/engine/packages/pegboard-runner/src/ping_task.rs b/engine/packages/pegboard-runner/src/ping_task.rs index 60a144f342..b024abbf25 100644 --- a/engine/packages/pegboard-runner/src/ping_task.rs +++ b/engine/packages/pegboard-runner/src/ping_task.rs @@ -17,8 +17,9 @@ pub async fn task( ctx: StandaloneCtx, conn: Arc, mut ping_abort_rx: watch::Receiver<()>, - update_ping_interval: Duration, ) -> Result { + let update_ping_interval = + Duration::from_millis(ctx.config().pegboard().runner_update_ping_interval_ms()); let ping_timeout_ms = ctx.config().pegboard().runner_ping_timeout_ms(); loop {