LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2025-01-24 10:55:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
phiresky 2024-04-15 18:45:57 +02:00
parent a3d705f0d6
commit 7eedcb7be2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/federate/src/worker.rs
View file

@ -17,7 +17,7 @@ use chrono::{DateTime, Days, TimeZone, Utc};
use lemmy_api_common::{context::LemmyContext, federate_retry_sleep_duration}; use lemmy_api_common::{context::LemmyContext, federate_retry_sleep_duration};
use lemmy_apub::{activity_lists::SharedInboxActivities, FEDERATION_CONTEXT}; use lemmy_apub::{activity_lists::SharedInboxActivities, FEDERATION_CONTEXT};
use lemmy_db_schema::{ use lemmy_db_schema::{
newtypes::{ActivityId}, newtypes::ActivityId,
source::{ source::{
activity::SentActivity, activity::SentActivity,
federation_queue_state::FederationQueueState, federation_queue_state::FederationQueueState,
@ -28,7 +28,7 @@ use lemmy_db_schema::{
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use reqwest::Url; use reqwest::Url;
use std::{ use std::{
collections::{BinaryHeap}, collections::BinaryHeap,
ops::{Add, Deref}, ops::{Add, Deref},
time::Duration, time::Duration,
}; };
@ -300,6 +300,8 @@ impl InstanceWorker {
Ok(()) Ok(())
} }
/// we collect the relevant inboxes in the main instance worker task, and only spawn the send task if we have inboxes to send to
/// this limits CPU usage and reduces overhead for the (many) cases where we don't have any inboxes
async fn spawn_send_if_needed( async fn spawn_send_if_needed(
&mut self, &mut self,
activity_id: ActivityId, activity_id: ActivityId,
@ -338,7 +340,7 @@ impl InstanceWorker {
let domain = self.instance.domain.clone(); let domain = self.instance.domain.clone();
tokio::spawn(async move { tokio::spawn(async move {
let mut report = report; let mut report = report;
if let Err(e) = InstanceWorker::send_retry_loop( let res = InstanceWorker::send_retry_loop(
&ele.0, &ele.0,
&ele.1, &ele.1,
inbox_urls, inbox_urls,
@ -348,8 +350,8 @@ impl InstanceWorker {
data, data,
stop, stop,
) )
.await .await;
{ if let Err(e) = res {
tracing::warn!( tracing::warn!(
"sending {} errored internally, skipping activity: {:?}", "sending {} errored internally, skipping activity: {:?}",
ele.0.ap_id, ele.0.ap_id,