nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-19 19:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

overlord: track urls we are watching

Browse Source
This commit is contained in:
Mike Dilger 2022-12-26 13:05:57 +13:00
parent 3795034b1e
commit bd9f57cb44
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/overlord/mod.rs
View File

@ -23,7 +23,12 @@ pub struct Overlord {
// All the minion tasks running. // All the minion tasks running.
minions: task::JoinSet<()>, minions: task::JoinSet<()>,
// Map from minion task::Id to Url
minions_task_url: HashMap<task::Id, Url>, minions_task_url: HashMap<task::Id, Url>,
// Vec of urls our minions are handling
urls_watching: Vec<Url>,
#[allow(dead_code)] #[allow(dead_code)]
private_key: Option<PrivateKey>, // note that PrivateKey already zeroizes on drop private_key: Option<PrivateKey>, // note that PrivateKey already zeroizes on drop
} }
@ -37,6 +42,7 @@ impl Overlord {
from_minions, from_minions,
minions: task::JoinSet::new(), minions: task::JoinSet::new(),
minions_task_url: HashMap::new(), minions_task_url: HashMap::new(),
urls_watching: Vec::new(),
private_key: None, private_key: None,
} }
} }
@ -83,6 +89,9 @@ impl Overlord {
// Minion probably already logged failure in relay table // Minion probably already logged failure in relay table
// Remove from our urls_watching vec
self.urls_watching.retain(|value| value != url);
// Remove from our hashmap // Remove from our hashmap
self.minions_task_url.remove(&id); self.minions_task_url.remove(&id);
} }
@ -97,6 +106,9 @@ impl Overlord {
Some(url) => { Some(url) => {
info!("Relay Task {} completed", &url); info!("Relay Task {} completed", &url);
// Remove from our urls_watching vec
self.urls_watching.retain(|value| value != url);
// Remove from our hashmap // Remove from our hashmap
self.minions_task_url.remove(&id); self.minions_task_url.remove(&id);
} }
@ -255,7 +267,8 @@ impl Overlord {
let mut minion = Minion::new(moved_url, pubkeys).await?; let mut minion = Minion::new(moved_url, pubkeys).await?;
let abort_handle = self.minions.spawn(async move { minion.handle().await }); let abort_handle = self.minions.spawn(async move { minion.handle().await });
let id = abort_handle.id(); let id = abort_handle.id();
self.minions_task_url.insert(id, Url(url)); self.minions_task_url.insert(id, Url(url.clone()));
self.urls_watching.push(Url(url));
Ok(()) Ok(())
} }
@ -291,6 +304,9 @@ impl Overlord {
// Minion probably already logged failure in relay table // Minion probably already logged failure in relay table
// Remove from our urls_watching vec
self.urls_watching.retain(|value| value != url);
// Remove from our hashmap // Remove from our hashmap
self.minions_task_url.remove(&id); self.minions_task_url.remove(&id);
}, },
@ -305,6 +321,9 @@ impl Overlord {
Some(url) => { Some(url) => {
warn!("Relay Task {} completed", &url); warn!("Relay Task {} completed", &url);
// Remove from our urls_watching vec
self.urls_watching.retain(|value| value != url);
// Remove from our hashmap // Remove from our hashmap
self.minions_task_url.remove(&id); self.minions_task_url.remove(&id);
}, },