Verified Commit 6ac251db authored by Mattia Righetti's avatar Mattia Righetti
Browse files

refactor: misc refactoring

parent 1f8e5d4d

src/metrics/bandwidth.rs

+7 −7
Original line number Diff line number Diff line
@@ -9,13 +9,6 @@ pub struct RelayBandwidthRow { 
    pub overload_fd_exhausted_timestamp: Option<chrono::NaiveDateTime>,

}



#[derive(Debug, Clone, sqlx::FromRow)]

pub struct BridgeBandwidthRow {

    pub fingerprint: String,

    pub overload_ratelimits_ratelimit: Option<i64>,

    pub overload_fd_exhausted_timestamp: Option<chrono::NaiveDateTime>,

}



pub async fn relay_bandwidth(

    pg: &PgPool,

    filters: &QueryFilters,
@@ -120,6 +113,13 @@ pub async fn relay_bandwidth( 
    sqlx::query_as::<_, RelayBandwidthRow>(sql).fetch_all(pg).await.map_err(|e| e.to_string())

}



#[derive(Debug, Clone, sqlx::FromRow)]

pub struct BridgeBandwidthRow {

    pub fingerprint: String,

    pub overload_ratelimits_ratelimit: Option<i64>,

    pub overload_fd_exhausted_timestamp: Option<chrono::NaiveDateTime>,

}



pub async fn bridge_bandwidth(

    pg: &PgPool,

    filters: &QueryFilters,

src/metrics/details.rs

+22 −21
Original line number Diff line number Diff line
@@ -39,25 +39,6 @@ pub struct RelayDetailsRow { 
    pub bandwidth_measured: Option<i64>,

}



#[derive(Debug, sqlx::FromRow)]

pub struct BridgeDetailsRow {

    pub nickname: String,

    pub fingerprint: String,

    pub or_addresses: Option<String>,

    pub first_seen: NaiveDateTime,

    pub last_seen: NaiveDateTime,

    pub running: Option<bool>,

    pub flags: Option<String>,

    pub last_restarted: NaiveDateTime,

    pub overload_general_timestamp: Option<i64>,

    pub version: Option<String>,

    pub platform: Option<String>,

    pub version_status: Option<String>,

    pub transport: Option<String>,

    pub blocklist: Option<String>,

    pub bridgedb_distributor: Option<String>,

}



pub async fn relay_details(

    pg: &PgPool,

    filters: &QueryFilters,
@@ -190,6 +171,25 @@ pub async fn relay_details( 
    query.build_query_as().fetch_all(pg).await.map_err(|e| e.to_string())

}



#[derive(Debug, sqlx::FromRow)]

pub struct BridgeDetailsRow {

    pub nickname: String,

    pub fingerprint: String,

    pub or_addresses: Option<String>,

    pub first_seen: NaiveDateTime,

    pub last_seen: NaiveDateTime,

    pub running: Option<bool>,

    pub flags: Option<String>,

    pub last_restarted: NaiveDateTime,

    pub overload_general_timestamp: Option<i64>,

    pub version: Option<String>,

    pub platform: Option<String>,

    pub version_status: Option<String>,

    pub transport: Option<String>,

    pub blocklist: Option<String>,

    pub bridgedb_distributor: Option<String>,

}



pub async fn bridge_details(

    pg: &PgPool,

    filters: &QueryFilters,
@@ -210,8 +210,9 @@ pub async fn bridge_details( 
            ss.transport,

            ss.blocklist,

            ss.bridgedb_distributor

        FROM server_status ss

        JOIN server_descriptor sd on ss.fingerprint = sd.fingerprint

        FROM server_status ss JOIN

            server_descriptor sd

            ON ss.fingerprint = sd.fingerprint

        WHERE ss.is_bridge = TRUE"#,

    );

src/metrics/summary.rs

+7 −7
Original line number Diff line number Diff line
@@ -9,13 +9,6 @@ pub struct RelaySummaryRow { 
    pub running: Option<bool>,

}



#[derive(Debug, sqlx::FromRow)]

pub struct BridgeSummaryRow {

    pub nickname: String,

    pub fingerprint: String,

    pub running: Option<bool>,

}



pub async fn relay_summary(

    pg: &PgPool,

    filters: &QueryFilters,
@@ -114,6 +107,13 @@ pub async fn relay_summary( 
    query.build_query_as().fetch_all(pg).await.map_err(|e| e.to_string())

}



#[derive(Debug, sqlx::FromRow)]

pub struct BridgeSummaryRow {

    pub nickname: String,

    pub fingerprint: String,

    pub running: Option<bool>,

}



pub async fn bridges_summary(

    pg: &PgPool,

    filters: &QueryFilters,