Use the log create instead of println

This commit is contained in:
Slatian
2025-02-09 15:11:17 +01:00
parent 2aae2d6626
commit d902dae35d
6 changed files with 84 additions and 40 deletions

View File

@ -17,12 +17,14 @@ use axum_client_ip::SecureClientIp;
use axum_extra::headers;
use axum_extra::TypedHeader;
use clap::Parser;
use regex::Regex;
use serde::{Deserialize,Serialize};
use tower::ServiceBuilder;
use tower_http::services::ServeDir;
use env_logger::Env;
use hickory_resolver::Name;
use hickory_resolver::TokioAsyncResolver;
use log::{info,warn,error};
use regex::Regex;
use serde::{Deserialize,Serialize};
use tower_http::services::ServeDir;
use tower::ServiceBuilder;
use tokio::signal::unix::{
signal,
@ -143,6 +145,10 @@ fn match_domain_hidden_list(domain: &String, hidden_list: &Vec<String>) -> bool
#[tokio::main]
async fn main() {
// Initalize logger:
env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
// Parse Command line arguments
let cli_args = CliArgs::parse();
@ -152,9 +158,9 @@ async fn main() {
match read_toml_from_file::<config::EchoIpServiceConfig>(&config_path) {
Ok(c) => c,
Err(e) => {
println!("Could not read confuration file!");
println!("{e}");
println!("Exiting ...");
error!("Could not read confuration file!");
error!("{e}");
error!("Exiting ...");
::std::process::exit(1);
}
}
@ -174,7 +180,7 @@ async fn main() {
let templating_engine = match template_loader.load_templates() {
Ok(t) => t.into(),
Err(e) => {
println!("{e}");
error!("{e}");
::std::process::exit(1);
}
};
@ -183,7 +189,7 @@ async fn main() {
let static_file_directory = template_loader.base_dir()+"/static";
println!("Static files will be served from: {static_file_directory}");
info!("Static files will be served from: {static_file_directory}");
// Initalize GeoIP Database
@ -202,19 +208,19 @@ async fn main() {
location_db.reload_database().ok();
// Initalize DNS resolver with os defaults
println!("Initalizing dns resolvers ...");
info!("Initalizing dns resolvers ...");
let mut dns_resolver_selectables = Vec::<Selectable>::new();
let mut dns_resolver_map: HashMap<Arc<str>,TokioAsyncResolver> = HashMap::new();
let mut dns_resolver_aliases: HashMap<Arc<str>,Arc<str>> = HashMap::new();
if config.dns.enable_system_resolver {
println!("Initalizing System resolver ...");
info!("Initalizing System resolver ...");
let res = TokioAsyncResolver::tokio_from_system_conf();
let resolver = match res {
Ok(resolver) => resolver,
Err(e) => {
println!("Error while setting up dns resolver: {e}");
info!("Error while setting up dns resolver: {e}");
::std::process::exit(1);
}
};
@ -228,7 +234,7 @@ async fn main() {
}
for (key, resolver_config) in &config.dns.resolver {
println!("Initalizing {} resolver ...", key);
info!("Initalizing {} resolver ...", key);
let resolver = TokioAsyncResolver::tokio(
resolver_config.to_hickory_resolver_config(),
Default::default()
@ -270,18 +276,18 @@ async fn main() {
let signal_usr1_handlers_state = shared_state.clone();
task::spawn(async move {
println!("Trying to register USR1 signal for reloading geoip databases");
info!("Trying to register USR1 signal for reloading geoip databases");
let mut signal_stream = match signal(SignalKind::user_defined1()) {
Ok(signal_stream) => signal_stream,
Err(e) => {
println!("Error while registring signal handler: {e}");
println!("Continuing without ...");
error!("Error while registring signal handler: {e}");
warn!("Continuing without geoip reaload signal ...");
return;
}
};
loop {
if None == signal_stream.recv().await { return; }
println!("Received signal USR1, reloading geoip databses!");
info!("Received signal USR1, reloading geoip databses!");
signal_usr1_handlers_state.location_db.reload_database().ok();
signal_usr1_handlers_state.asn_db.reload_database().ok();
}
@ -313,7 +319,7 @@ async fn main() {
)
;
println!("Starting Server on {} ...",listen_on);
info!("Starting Server on {} ...",listen_on);
let listener = tokio::net::TcpListener::bind(&listen_on).await.unwrap();
axum::serve(listener, app.into_make_service_with_connect_info::<std::net::SocketAddr>())