mirrors/buzzrelay
1
0
Fork 0
mirror of https://github.com/astro/buzzrelay.git synced 2024-11-24 04:50:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

relay: add restriction to 1 worker per inbox

Browse source
This commit is contained in:
Astro 2023-05-15 00:50:59 +02:00
parent 10eec5b64b
commit 390f7653fb
1 changed files with 46 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/relay.rs
View file

@ -1,4 +1,5 @@
use std::{sync::Arc, collections::HashSet, time::Instant}; use std::{sync::Arc, collections::{HashSet, HashMap}, time::Instant};
use futures::{channel::mpsc::{channel, Sender}, StreamExt};
use metrics::{increment_counter, histogram}; use metrics::{increment_counter, histogram};
use serde::Deserialize; use serde::Deserialize;
use serde_json::json; use serde_json::json;
@ -60,6 +61,39 @@ struct Tag<'a> {
pub name: &'a str, pub name: &'a str,
} }
struct Job {
body: Arc<Vec<u8>>,
key_id: String,
private_key: Arc<PrivateKey>,
}
fn spawn_worker(client: Arc<reqwest::Client>, inbox: String) -> Sender<Job> {
let (tx, mut rx) = channel(1024);
tokio::spawn(async move {
while let Some(Job { key_id, private_key, body }) = rx.next().await {
tracing::debug!("relay to {}", inbox);
if let Err(e) = send::send_raw(
&client, &inbox,
&key_id, &private_key, body
).await {
tracing::error!("relay::send {:?}", e);
} else {
// success
systemd::daemon::notify(
false, [
(systemd::daemon::STATE_WATCHDOG, "1")
].iter()
).unwrap();
}
}
panic!("Worker dead");
});
tx
}
pub fn spawn( pub fn spawn(
client: Arc<reqwest::Client>, client: Arc<reqwest::Client>,
hostname: Arc<String>, hostname: Arc<String>,
@ -70,6 +104,8 @@ pub fn spawn(
let private_key = Arc::new(private_key); let private_key = Arc::new(private_key);
tokio::spawn(async move { tokio::spawn(async move {
let mut workers = HashMap::new();
while let Some(data) = stream_rx.recv().await { while let Some(data) = stream_rx.recv().await {
let t1 = Instant::now(); let t1 = Instant::now();
let post: Post = match serde_json::from_str(&data) { let post: Post = match serde_json::from_str(&data) {
@ -113,26 +149,15 @@ pub fn spawn(
continue; continue;
} }
seen_inboxes.insert(inbox.clone()); seen_inboxes.insert(inbox.clone());
let client_ = client.clone();
let body_ = body.clone(); let job = Job {
let key_id = actor.key_id(); body: body.clone(),
let private_key_ = private_key.clone(); key_id: actor.key_id(),
tracing::debug!("relay {} from {} to {}", &post_url, actor_id, inbox); private_key: private_key.clone(),
tokio::spawn(async move { };
if let Err(e) = send::send_raw( let tx = workers.entry(inbox.clone())
&client_, &inbox, .or_insert_with(|| spawn_worker(client.clone(), inbox.clone()));
&key_id, &private_key_, body_ let _ = tx.try_send(job);
).await {
tracing::error!("relay::send {:?}", e);
} else {
// success
systemd::daemon::notify(
false, [
(systemd::daemon::STATE_WATCHDOG, "1")
].iter()
).unwrap();
}
});
} }
seen_actors.insert(actor); seen_actors.insert(actor);