true logging + cleaning main
parent
186674da22
commit
e777571d12
|
|
@ -3,8 +3,9 @@ use env_logger::Builder;
|
||||||
use log::LevelFilter;
|
use log::LevelFilter;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
|
use log::info;
|
||||||
|
|
||||||
pub fn setup_logger() -> Result<()> {
|
pub async fn setup_logger() -> Result<()> {
|
||||||
Builder::new()
|
Builder::new()
|
||||||
.format(move |buf, record| {
|
.format(move |buf, record| {
|
||||||
writeln!(
|
writeln!(
|
||||||
|
|
@ -20,5 +21,6 @@ pub fn setup_logger() -> Result<()> {
|
||||||
.target(env_logger::Target::Stdout)
|
.target(env_logger::Target::Stdout)
|
||||||
.init();
|
.init();
|
||||||
|
|
||||||
|
info!("Logger configured");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
@ -3,8 +3,10 @@ mod net;
|
||||||
mod logger;
|
mod logger;
|
||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
|
use integr_structs::api::ApiConfig;
|
||||||
use logger::setup_logger;
|
use logger::setup_logger;
|
||||||
use log::info;
|
use log::{info, warn};
|
||||||
|
use config::pull_local_config;
|
||||||
|
|
||||||
#[tokio::main(flavor = "multi_thread")]
|
#[tokio::main(flavor = "multi_thread")]
|
||||||
async fn main() -> Result<()>{
|
async fn main() -> Result<()>{
|
||||||
|
|
@ -12,7 +14,20 @@ async fn main() -> Result<()>{
|
||||||
// 1) unix-socket coroutine (for config updating)
|
// 1) unix-socket coroutine (for config updating)
|
||||||
// 2) api coroutine
|
// 2) api coroutine
|
||||||
// 3) ?
|
// 3) ?
|
||||||
setup_logger()?;
|
setup_logger().await?;
|
||||||
info!("Logger configured");
|
let config = get_config().await;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn get_config() -> ApiConfig {
|
||||||
|
return match pull_local_config().await {
|
||||||
|
Ok(conf) => {
|
||||||
|
info!("Local config was loaded");
|
||||||
|
conf
|
||||||
|
},
|
||||||
|
Err(er) => {
|
||||||
|
warn!("Cannot get local config due to {}", er);
|
||||||
|
ApiConfig::default()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue