From ecb849f7fa60bf9f5b029cad110e8bbffac1b5a8 Mon Sep 17 00:00:00 2001 From: asleepyskye Date: Fri, 2 May 2025 17:51:33 -0400 Subject: [PATCH] fix(scheduled_tasks): update format of gateway_url, rename prom url --- crates/libpk/src/_config.rs | 2 +- crates/scheduled_tasks/src/tasks.rs | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/crates/libpk/src/_config.rs b/crates/libpk/src/_config.rs index 33b6c08a..6a489c93 100644 --- a/crates/libpk/src/_config.rs +++ b/crates/libpk/src/_config.rs @@ -88,7 +88,7 @@ pub struct ScheduledTasksConfig { pub set_guild_count: bool, pub expected_gateway_count: usize, pub gateway_url: String, - pub vm_url: String, + pub prometheus_url: String, } fn _metrics_default() -> bool { diff --git a/crates/scheduled_tasks/src/tasks.rs b/crates/scheduled_tasks/src/tasks.rs index b3b7f579..c7308ed3 100644 --- a/crates/scheduled_tasks/src/tasks.rs +++ b/crates/scheduled_tasks/src/tasks.rs @@ -92,15 +92,14 @@ pub async fn update_discord_stats(ctx: AppCtx) -> anyhow::Result<()> { let mut guild_count = 0; let mut channel_count = 0; + let mut url = cfg.gateway_url.clone(); for idx in 0..cfg.expected_gateway_count { - let res = client - .get(format!( - "http://pluralkit-gateway-{idx}.{}/stats", - cfg.gateway_url - )) - .send() - .await?; + if url.contains("{clusterid}") { + url = url.replace("{clusterid}", &idx.to_string()); + } + + let res = client.get(&url).send().await?; let stat: GatewayStatus = res.json().await?; @@ -188,7 +187,7 @@ pub async fn update_stats_api(ctx: AppCtx) -> anyhow::Result<()> { ($t:ty, $q:expr) => {{ tracing::info!("Query: {}", $q); let resp = client - .get(format!("{}/api/v1/query?query={}", cfg.vm_url, $q)) + .get(format!("{}/api/v1/query?query={}", cfg.prometheus_url, $q)) .send() .await?;