crashlabs/huskies
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

huskies: merge 765

Browse Source
This commit is contained in:
dave
2026-04-28 09:28:13 +00:00
parent 38e828979c
commit 8a51dbd2ed
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/agent_mode.rs
+6 -2
View File
@@ -295,9 +295,12 @@ fn write_heartbeat(rendezvous_url: &str, port: u16) {
return; return;
}; };
let now = chrono::Utc::now().timestamp() as f64; let now = chrono::Utc::now().timestamp() as f64;
let now_ms = chrono::Utc::now().timestamp_millis() as f64;
// Advertise our crdt-sync endpoint. // Advertise our crdt-sync endpoint.
let address = format!("ws://0.0.0.0:{port}/crdt-sync"); let address = format!("ws://0.0.0.0:{port}/crdt-sync");
crdt_state::write_node_presence(&node_id, &address, now, true); crdt_state::write_node_presence(&node_id, &address, now, true);
// Write millisecond-precision timestamp via LWW register.
crdt_state::write_node_metadata(&node_id, "", None, now_ms);
slog!( slog!(
"[agent-mode] Heartbeat written: node={:.12}… rendezvous={rendezvous_url}", "[agent-mode] Heartbeat written: node={:.12}… rendezvous={rendezvous_url}",
&node_id &node_id
@@ -368,8 +371,9 @@ async fn scan_and_claim(
.unwrap_or_default() .unwrap_or_default()
.into_iter() .into_iter()
.filter(|n| { .filter(|n| {
let now = chrono::Utc::now().timestamp() as f64; let now_ms = chrono::Utc::now().timestamp_millis() as f64;
n.alive && (now - n.last_seen) < CLAIM_TIMEOUT_SECS let last_ms = n.last_seen_ms.unwrap_or(n.last_seen * 1000.0);
n.alive && (now_ms - last_ms) / 1000.0 < CLAIM_TIMEOUT_SECS
}) })
.map(|n| n.node_id) .map(|n| n.node_id)
.collect(); .collect();
server/src/mesh.rs
+3 -1
View File
@@ -70,10 +70,12 @@ impl MeshManager {
let alive_peers: Vec<(String, String)> = nodes let alive_peers: Vec<(String, String)> = nodes
.into_iter() .into_iter()
.filter(|n| { .filter(|n| {
let now_ms = now * 1000.0;
let last_ms = n.last_seen_ms.unwrap_or(n.last_seen * 1000.0);
n.alive n.alive
&& !n.address.is_empty() && !n.address.is_empty()
&& n.node_id != self.our_node_id && n.node_id != self.our_node_id
&& (now - n.last_seen) < 600.0 && (now_ms - last_ms) / 1000.0 < 600.0
&& !self.is_rendezvous_peer(&n.address) && !self.is_rendezvous_peer(&n.address)
}) })
.map(|n| (n.node_id, n.address)) .map(|n| (n.node_id, n.address))