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

View file

@ -1,5 +1,5 @@
use crate::config::Config;
use crate::{write_error, HTTP_CLIENT};
use crate::{HTTP_CLIENT};
use lemmy_api_common::community::{ListCommunities, ListCommunitiesResponse};
use lemmy_api_common::lemmy_db_views::structs::PostView;
use lemmy_api_common::person::{Login, LoginResponse};
@ -10,6 +10,16 @@ use lemmy_db_schema::{ListingType, PostFeatureType};
use reqwest::StatusCode;
use std::collections::HashMap;
use url::Url;
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),
}
};
}
pub(crate) struct Lemmy {
jwt_token: Sensitive<String>,
@ -45,7 +55,7 @@ pub(crate) async fn login(config: &Config) -> Result<Lemmy, ()> {
Ok(data) => data,
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
error!(err_msg);
return Err(());
}
};
@ -63,14 +73,14 @@ pub(crate) async fn login(config: &Config) -> Result<Lemmy, ()> {
}),
None => {
let err_msg = "Login did not return JWT token. Are the credentials valid?".to_owned();
write_error(err_msg);
error!(err_msg);
Err(())
}
}
}
status => {
let err_msg = format!("Unexpected HTTP Status '{}' during Login", status);
write_error(err_msg);
error!(err_msg);
Err(())
}
}
@ -273,14 +283,14 @@ impl Lemmy {
Ok(data) => data,
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
return Err(());
error!(err_msg);
Err(())
}
},
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
return Err(());
error!(err_msg);
Err(())
}
};
@ -288,8 +298,8 @@ impl Lemmy {
Ok(data) => data,
Err(e) => {
let err_msg = format!("{e}");
write_error(err_msg);
return Err(());
error!(err_msg);
Err(())
}
};