mirror of https://github.com/LemmyNet/lemmy
add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api * feature gate * move retry sleep function * move stuff aroundpull/4098/head^2
parent
8c85f35b19
commit
b9b65c9c18
@ -0,0 +1,46 @@
|
|||||||
|
use crate::{
|
||||||
|
newtypes::InstanceId,
|
||||||
|
source::federation_queue_state::FederationQueueState,
|
||||||
|
utils::{get_conn, DbPool},
|
||||||
|
};
|
||||||
|
use diesel::{prelude::*, result::Error};
|
||||||
|
use diesel_async::RunQueryDsl;
|
||||||
|
|
||||||
|
impl FederationQueueState {
|
||||||
|
/// load state or return a default empty value
|
||||||
|
pub async fn load(
|
||||||
|
pool: &mut DbPool<'_>,
|
||||||
|
instance_id_: InstanceId,
|
||||||
|
) -> Result<FederationQueueState, Error> {
|
||||||
|
use crate::schema::federation_queue_state::dsl::{federation_queue_state, instance_id};
|
||||||
|
let conn = &mut get_conn(pool).await?;
|
||||||
|
Ok(
|
||||||
|
federation_queue_state
|
||||||
|
.filter(instance_id.eq(&instance_id_))
|
||||||
|
.select(FederationQueueState::as_select())
|
||||||
|
.get_result(conn)
|
||||||
|
.await
|
||||||
|
.optional()?
|
||||||
|
.unwrap_or(FederationQueueState {
|
||||||
|
instance_id: instance_id_,
|
||||||
|
fail_count: 0,
|
||||||
|
last_retry: None,
|
||||||
|
last_successful_id: None, // this value is set to the most current id for new instances
|
||||||
|
last_successful_published_time: None,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
pub async fn upsert(pool: &mut DbPool<'_>, state: &FederationQueueState) -> Result<(), Error> {
|
||||||
|
use crate::schema::federation_queue_state::dsl::{federation_queue_state, instance_id};
|
||||||
|
let conn = &mut get_conn(pool).await?;
|
||||||
|
|
||||||
|
state
|
||||||
|
.insert_into(federation_queue_state)
|
||||||
|
.on_conflict(instance_id)
|
||||||
|
.do_update()
|
||||||
|
.set(state)
|
||||||
|
.execute(conn)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,26 @@
|
|||||||
|
use crate::newtypes::{ActivityId, InstanceId};
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
#[cfg(feature = "full")]
|
||||||
|
use diesel::prelude::*;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
#[cfg(feature = "full")]
|
||||||
|
use ts_rs::TS;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
|
#[cfg_attr(
|
||||||
|
feature = "full",
|
||||||
|
derive(Queryable, Selectable, Insertable, AsChangeset)
|
||||||
|
)]
|
||||||
|
#[cfg_attr(feature = "full", derive(TS))]
|
||||||
|
#[cfg_attr(feature = "full", diesel(table_name = crate::schema::federation_queue_state))]
|
||||||
|
#[cfg_attr(feature = "full", diesel(check_for_backend(diesel::pg::Pg)))]
|
||||||
|
pub struct FederationQueueState {
|
||||||
|
pub instance_id: InstanceId,
|
||||||
|
/// the last successfully sent activity id
|
||||||
|
pub last_successful_id: Option<ActivityId>,
|
||||||
|
pub last_successful_published_time: Option<DateTime<Utc>>,
|
||||||
|
/// how many failed attempts have been made to send the next activity
|
||||||
|
pub fail_count: i32,
|
||||||
|
/// timestamp of the last retry attempt (when the last failing activity was resent)
|
||||||
|
pub last_retry: Option<DateTime<Utc>>,
|
||||||
|
}
|
@ -1,63 +0,0 @@
|
|||||||
use crate::util::ActivityId;
|
|
||||||
use anyhow::Result;
|
|
||||||
use chrono::{DateTime, TimeZone, Utc};
|
|
||||||
use diesel::prelude::*;
|
|
||||||
use diesel_async::RunQueryDsl;
|
|
||||||
use lemmy_db_schema::{
|
|
||||||
newtypes::InstanceId,
|
|
||||||
utils::{get_conn, DbPool},
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Queryable, Selectable, Insertable, AsChangeset, Clone)]
|
|
||||||
#[diesel(table_name = lemmy_db_schema::schema::federation_queue_state)]
|
|
||||||
#[diesel(check_for_backend(diesel::pg::Pg))]
|
|
||||||
pub struct FederationQueueState {
|
|
||||||
pub instance_id: InstanceId,
|
|
||||||
pub last_successful_id: ActivityId, // todo: i64
|
|
||||||
pub fail_count: i32,
|
|
||||||
pub last_retry: DateTime<Utc>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FederationQueueState {
|
|
||||||
/// load state or return a default empty value
|
|
||||||
pub async fn load(
|
|
||||||
pool: &mut DbPool<'_>,
|
|
||||||
instance_id_: InstanceId,
|
|
||||||
) -> Result<FederationQueueState> {
|
|
||||||
use lemmy_db_schema::schema::federation_queue_state::dsl::{
|
|
||||||
federation_queue_state,
|
|
||||||
instance_id,
|
|
||||||
};
|
|
||||||
let conn = &mut get_conn(pool).await?;
|
|
||||||
Ok(
|
|
||||||
federation_queue_state
|
|
||||||
.filter(instance_id.eq(&instance_id_))
|
|
||||||
.select(FederationQueueState::as_select())
|
|
||||||
.get_result(conn)
|
|
||||||
.await
|
|
||||||
.optional()?
|
|
||||||
.unwrap_or(FederationQueueState {
|
|
||||||
instance_id: instance_id_,
|
|
||||||
fail_count: 0,
|
|
||||||
last_retry: Utc.timestamp_nanos(0),
|
|
||||||
last_successful_id: -1, // this value is set to the most current id for new instances
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
pub async fn upsert(pool: &mut DbPool<'_>, state: &FederationQueueState) -> Result<()> {
|
|
||||||
use lemmy_db_schema::schema::federation_queue_state::dsl::{
|
|
||||||
federation_queue_state,
|
|
||||||
instance_id,
|
|
||||||
};
|
|
||||||
let conn = &mut get_conn(pool).await?;
|
|
||||||
|
|
||||||
state
|
|
||||||
.insert_into(federation_queue_state)
|
|
||||||
.on_conflict(instance_id)
|
|
||||||
.do_update()
|
|
||||||
.set(state)
|
|
||||||
.execute(conn)
|
|
||||||
.await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
@ -0,0 +1,5 @@
|
|||||||
|
ALTER TABLE federation_queue_state
|
||||||
|
DROP COLUMN last_successful_published_time,
|
||||||
|
ALTER COLUMN last_successful_id SET NOT NULL,
|
||||||
|
ALTER COLUMN last_retry SET NOT NULL;
|
||||||
|
|
@ -0,0 +1,5 @@
|
|||||||
|
ALTER TABLE federation_queue_state
|
||||||
|
ADD COLUMN last_successful_published_time timestamptz NULL,
|
||||||
|
ALTER COLUMN last_successful_id DROP NOT NULL,
|
||||||
|
ALTER COLUMN last_retry DROP NOT NULL;
|
||||||
|
|
Loading…
Reference in New Issue