astro/alert2muc
astro
/
alert2muc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

delint with clippy

This commit is contained in:
Astro 2022-12-17 00:52:36 +01:00
parent 55c2915f6c
commit fb31895c1e
2 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/jabber.rs
View File

@ -50,26 +50,23 @@ pub async fn run(jid: String, password: String, muc_jid: String) -> Handle {
let (mut sink, mut stream) = client.split(); let (mut sink, mut stream) = client.split();
tokio::spawn(async move { tokio::spawn(async move {
while let Some(event) = stream.next().await { while let Some(event) = stream.next().await {
match event { if let Event::Stanza(el) = event {
Event::Stanza(el) => { if el.is("presence", "jabber:client") {
if el.is("presence", "jabber:client") { match Presence::try_from(el) {
match Presence::try_from(el) { Ok(presence) => {
Ok(presence) => { if presence.from == Some(Jid::Full(muc_jid.clone())) {
if presence.from == Some(Jid::Full(muc_jid.clone())) { if presence.type_ == PresenceType::Error {
if presence.type_ == PresenceType::Error { println!("Failed to enter MUC {:?}", muc_jid);
println!("Failed to enter MUC {:?}", muc_jid); } else {
} else { println!("Entered MUC {:?}", muc_jid);
println!("Entered MUC {:?}", muc_jid);
}
} }
}, }
Err(err) => println!("Received invalid presence: {:?}", err), },
} Err(err) => println!("Received invalid presence: {:?}", err),
} }
systemd::daemon::notify(false, [(systemd::daemon::STATE_WATCHDOG, "1")].iter())
.unwrap();
} }
_ => {} systemd::daemon::notify(false, [(systemd::daemon::STATE_WATCHDOG, "1")].iter())
.unwrap();
} }
} }

14
src/main.rs
View File

@ -38,9 +38,9 @@ async fn alerts(
State(state): State<AppState>, State(state): State<AppState>,
Json(payload): Json<Vec<Alert>>, Json(payload): Json<Vec<Alert>>,
) -> Response { ) -> Response {
let mut message = "".to_string(); let mut message = String::new();
let mut alerts = state.alerts.lock().unwrap(); let mut alerts = state.alerts.lock().unwrap();
for alert in payload.into_iter() { for alert in payload {
let is_old = if let Some(old_alert) = alerts.get(&alert.generatorURL) { let is_old = if let Some(old_alert) = alerts.get(&alert.generatorURL) {
old_alert.startsAt == alert.startsAt old_alert.startsAt == alert.startsAt
} else { } else {
@ -48,7 +48,7 @@ async fn alerts(
}; };
if ! is_old { if ! is_old {
if message != "" { if !message.is_empty() {
message += "\n"; message += "\n";
} }
let title = match (alert.labels.get("alertname"), alert.labels.get("instance")) { let title = match (alert.labels.get("alertname"), alert.labels.get("instance")) {
@ -61,7 +61,7 @@ async fn alerts(
} }
drop(alerts); drop(alerts);
if message != "" { if !message.is_empty() {
let jabber = state.jabber.clone(); let jabber = state.jabber.clone();
tokio::spawn(async move { tokio::spawn(async move {
jabber.send_message(message).await; jabber.send_message(message).await;
@ -84,11 +84,9 @@ async fn main() {
// initialize tracing // initialize tracing
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();
let config: Config = serde_json::from_str( let _config: Config = serde_json::from_str(
&std::fs::read_to_string( &std::fs::read_to_string(
std::env::args() std::env::args().nth(1)
.skip(1)
.next()
.expect("Call with config.json") .expect("Call with config.json")
).expect("read config") ).expect("read config")
).expect("parse config"); ).expect("parse config");