From ac3d17ce82fc11701dddca63bab2cc5032ca2958 Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Wed, 4 Jan 2023 22:41:48 +0000 Subject: [PATCH] fix updates pagination --- core/src/api/update.rs | 2 +- core/src/monitoring.rs | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/core/src/api/update.rs b/core/src/api/update.rs index 34bfc4b6f..372a35af1 100644 --- a/core/src/api/update.rs +++ b/core/src/api/update.rs @@ -24,7 +24,7 @@ pub fn router() -> Router { Query(value): Query| async move { let offset = value .get("offset") - .map(|v| v.as_u64().unwrap_or(0)) + .map(|v| v.as_str().unwrap_or("0").parse().unwrap_or(0)) .unwrap_or(0); let target = serde_json::from_str::(&value.to_string()).ok(); let updates = state diff --git a/core/src/monitoring.rs b/core/src/monitoring.rs index 481c44802..70922f4e2 100644 --- a/core/src/monitoring.rs +++ b/core/src/monitoring.rs @@ -31,13 +31,16 @@ impl State { } for (server, res) in servers.unwrap() { if let Err(e) = res { - println!("server unreachable: {e:?}"); - if let Some(slack) = &self.slack { - let (header, info) = generate_unreachable_message(&server); - let res = slack.send_message_with_header(&header, info.clone()).await; - if let Err(e) = res { - eprintln!("failed to send message to slack: {e} | header: {header} | info: {info:?}") + if e.to_string().contains("error trying to connect") { + if let Some(slack) = &self.slack { + let (header, info) = generate_unreachable_message(&server); + let res = slack.send_message_with_header(&header, info.clone()).await; + if let Err(e) = res { + eprintln!("failed to send message to slack: {e} | header: {header} | info: {info:?}") + } } + } else { + println!("failed to get stats from {}: {e:?}", server.name); } continue; }