Use macros over functions for error logging

This commit is contained in:
Neshura 2024-05-06 20:51:31 +02:00
parent 1cd30b1145
commit 36b59240d9
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
4 changed files with 107 additions and 33 deletions
src/fetchers

View file

@ -1,4 +1,4 @@
use crate::{write_error, HTTP_CLIENT, lemmy};
use crate::{HTTP_CLIENT, lemmy};
use chrono::{DateTime, Duration, Utc};
use serde_derive::{Deserialize, Serialize};
use std::cmp::Ordering;
@ -10,6 +10,16 @@ use crate::fetchers::Fetcher;
use crate::fetchers::jnovel::JPostInfo::{Chapter, Volume};
use crate::fetchers::jnovel::PartInfo::{NoParts, Part};
use crate::lemmy::{PostInfo, PostInfoInner};
use systemd_journal_logger::connected_to_journal;
macro_rules! error {
($msg:tt) => {
match connected_to_journal() {
true => log::error!("[ERROR] {}", $msg),
false => eprintln!("[ERROR] {}", $msg),
}
};
}
static PAST_DAYS_ELIGIBLE: u8 = 4;
@ -266,13 +276,13 @@ impl Fetcher for JFetcherOptions {
Ok(data) => data,
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
error!(err_msg);
return Err(());
}
},
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
error!(err_msg);
return Err(());
}
};
@ -281,7 +291,7 @@ impl Fetcher for JFetcherOptions {
Ok(data) => data,
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
error!(err_msg);
return Err(());
}
};
@ -392,13 +402,13 @@ async fn get_latest_prepub(volume_slug: &str) -> Result<Option<lemmy::PostInfoIn
Ok(data) => data,
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
error!(err_msg);
return Err(());
}
},
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
error!(err_msg);
return Err(());
}
};
@ -407,7 +417,7 @@ async fn get_latest_prepub(volume_slug: &str) -> Result<Option<lemmy::PostInfoIn
Ok(data) => data,
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
error!(err_msg);
return Err(());
}
};