grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Revert "re-remove debug comments""

Browse source 
This reverts commit 6d519ef376.
This commit is contained in:
phiresky 2023-09-21 11:45:33 +00:00
parent dec25f9ee8
commit 2c283d90ca
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/apub/src/activities/mod.rs
View file

@ -230,8 +230,7 @@ where
actor_type: actor.actor_type(), actor_type: actor.actor_type(),
actor_apub_id: actor.id().into(), actor_apub_id: actor.id().into(),
}; };
let created = SentActivity::create(&mut data.pool(), form).await?; SentActivity::create(&mut data.pool(), form).await?;
info!("Queued for send: {:?}", created);
Ok(()) Ok(())
} }

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

@ -161,21 +161,13 @@ impl InstanceWorker {
{ {
id += 1; id += 1;
processed_activities += 1; processed_activities += 1;
tracing::info!("looking at activity {id}, proc={processed_activities}, latest={latest_id}");
let Some(ele) = get_activity_cached(pool, id) let Some(ele) = get_activity_cached(pool, id)
.await .await
.context("failed reading activity from db")? .context("failed reading activity from db")?
else { else {
tracing::info!("activity {id} empty, marking latest");
self.state.last_successful_id = id; self.state.last_successful_id = id;
continue; continue;
}; };
tracing::info!(
"processing send of {} {} for {}",
ele.0.id,
ele.0.ap_id,
self.instance.domain
);
if let Err(e) = self.send_retry_loop(pool, &ele.0, &ele.1).await { if let Err(e) = self.send_retry_loop(pool, &ele.0, &ele.1).await {
tracing::warn!( tracing::warn!(
"sending {} errored internally, skipping activity: {:?}", "sending {} errored internally, skipping activity: {:?}",
@ -205,13 +197,6 @@ impl InstanceWorker {
.get_inbox_urls(pool, activity) .get_inbox_urls(pool, activity)
.await .await
.context("failed figuring out inbox urls")?; .context("failed figuring out inbox urls")?;
tracing::info!(
"inboxes of {} for {} {}: {:?}",
self.instance.domain,
activity.id,
activity.ap_id,
inbox_urls
);
if inbox_urls.is_empty() { if inbox_urls.is_empty() {
self.state.last_successful_id = activity.id; self.state.last_successful_id = activity.id;
return Ok(()); return Ok(());