Changed logger, and crate name

Cargo.lock

@@ -832,6 +832,29 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -1164,6 +1187,12 @@ dependencies = [
  "libm",
 ]
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -1428,15 +1457,6 @@ dependencies = [
  "libm",
 ]
 
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "object"
 version = "0.32.2"
@@ -1452,12 +1472,6 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
-[[package]]
-name = "paris"
-version = "1.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fecab3723493c7851f292cb060f3ee1c42f19b8d749345d0d7eaf3fd19aa62d"
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -1513,29 +1527,6 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "personal-website"
-version = "0.1.0"
-dependencies = [
- "actix-files",
- "actix-web",
- "actix-web-lab",
- "anyhow",
- "askama",
- "bcrypt",
- "camino",
- "clap",
- "crypto",
- "futures",
- "log",
- "serde",
- "simplelog",
- "sqlx",
- "time",
- "toml",
- "uuid",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.13"
@@ -1900,18 +1891,6 @@ dependencies = [
  "rand_core",
 ]
 
-[[package]]
-name = "simplelog"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
-dependencies = [
- "log",
- "paris",
- "termcolor",
- "time",
-]
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -2231,15 +2210,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.58"
@@ -2268,9 +2238,7 @@ checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
 dependencies = [
  "deranged",
  "itoa",
- "libc",
  "num-conv",
- "num_threads",
  "powerfmt",
  "serde",
  "time-core",
@@ -2550,6 +2518,29 @@ version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
+[[package]]
+name = "website"
+version = "0.1.0"
+dependencies = [
+ "actix-files",
+ "actix-web",
+ "actix-web-lab",
+ "anyhow",
+ "askama",
+ "bcrypt",
+ "camino",
+ "clap",
+ "crypto",
+ "env_logger",
+ "futures",
+ "log",
+ "serde",
+ "sqlx",
+ "time",
+ "toml",
+ "uuid",
+]
+
 [[package]]
 name = "whoami"
 version = "1.5.1"
@@ -2560,37 +2551,6 @@ dependencies = [
  "wasite",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "personal-website"
+name = "website"
 version = "0.1.0"
 edition = "2021"
 authors = [
@@ -12,9 +12,10 @@ authors = [
 clap = { version = "4.5.3", features = ["derive"] }
 anyhow = "1.0.81"
 camino = "1.1.6"
-simplelog = { version = "0.12.2", features = ["paris"] }
+# simplelog = { version = "0.12.2", features = ["paris"] }
 toml = "0.8.12"
 serde = { version = "1.0.197", features = ["derive"] }
+env_logger = "0.11.3"
 log = "0.4.21"
 
 #? web

src/logger.rs

@@ -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
     };
 
-
+    env_logger::builder()
-    CombinedLogger::init(
+        .filter_level(LevelFilter::Off)
-        vec![
+        .parse_env("RUST_LOG")
-            TermLogger::new(level, config, TerminalMode::Mixed, ColorChoice::Auto),
+        .filter_module("website", level)
-            // TODO: Set up loggin to file
+        .init();
-            // WriteLogger::new(LevelFilter::Info, Config::default(), File::create("my_rust_binary.log").unwrap()),
+    // env_logger::Builder::from_env(Env::default().default_filter_or("warn")).init();
-        ]
-    ).unwrap();
 }

src/main.rs

@@ -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(())

src/web/routes/mod.rs

@@ -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