Changed logger, and crate name

This commit is contained in:
2024-03-28 03:12:42 +02:00
parent b45ab7aef5
commit a417aa4b33
7 changed files with 66 additions and 109 deletions

View File

@@ -1,13 +1,11 @@
use simplelog::*;
use log::LevelFilter;
use crate::cli::CliArgs;
pub fn init_logger(cli: &CliArgs) {
// TODO: figure out what these do
let config = ConfigBuilder::new()
.build();
let level = if cli.debug {
LevelFilter::Debug
@@ -15,12 +13,10 @@ pub fn init_logger(cli: &CliArgs) {
LevelFilter::Info
};
CombinedLogger::init(
vec![
TermLogger::new(level, config, TerminalMode::Mixed, ColorChoice::Auto),
// TODO: Set up loggin to file
// WriteLogger::new(LevelFilter::Info, Config::default(), File::create("my_rust_binary.log").unwrap()),
]
).unwrap();
env_logger::builder()
.filter_level(LevelFilter::Off)
.parse_env("RUST_LOG")
.filter_module("website", level)
.init();
// env_logger::Builder::from_env(Env::default().default_filter_or("warn")).init();
}

View File

@@ -1,6 +1,6 @@
use clap::Parser;
mod public;
mod web;
mod logger;
mod cli;
mod config;
@@ -21,7 +21,7 @@ async fn main() -> std::io::Result<()> {
let Ok(database) = database::Database::new(config.get_ref()).await else {return Ok(())};
if let Err(e) = public::start_actix(config.get_ref(), database).await {
if let Err(e) = web::start_actix(config.get_ref(), database).await {
log::error!("Actix had an error: {e}");
}
Ok(())

View File

@@ -4,7 +4,7 @@ use actix_web_lab::respond::Html;
use actix_web::{web::Data, Responder, Result};
use askama::Template;
use crate::{database::Database, public::templates::IndexTemplate};
use crate::{database::Database, web::templates::IndexTemplate};
// NOTE: Not usefull to have database here but just so u know how