From c3210120108a35c1768a139374ac67c51ef5a687 Mon Sep 17 00:00:00 2001
From: Jake Hillion <jake@hillion.co.uk>
Date: Sun, 24 Jul 2022 21:47:42 +0100
Subject: [PATCH] switched to tide logging

---
 Cargo.lock  | 66 -----------------------------------------------------
 Cargo.toml  |  1 -
 src/main.rs | 10 ++++++--
 3 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 694a124..b184bb2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -56,15 +56,6 @@ dependencies = [
  "opaque-debug",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.58"
@@ -280,17 +271,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -599,19 +579,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "erased-serde"
 version = "0.3.21"
@@ -862,12 +829,6 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
 
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
 [[package]]
 name = "idna"
 version = "0.2.3"
@@ -901,7 +862,6 @@ dependencies = [
  "async-std",
  "diesel",
  "diesel_migrations",
- "env_logger",
  "log",
  "rust-embed",
  "thiserror",
@@ -1277,23 +1237,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "regex"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-
 [[package]]
 name = "route-recognizer"
 version = "0.2.0"
@@ -1626,15 +1569,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.31"
diff --git a/Cargo.toml b/Cargo.toml
index b6f300e..1a77cd0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
-env_logger = "0.9"
 thiserror = "1"
 
 async-std = "1"
diff --git a/src/main.rs b/src/main.rs
index 8df6fed..10f5ab4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,5 @@
+use tide::log;
+
 mod api;
 mod db;
 mod react;
@@ -18,8 +20,12 @@ extern crate diesel_migrations;
 embed_migrations!();
 
 fn main() -> Result<(), io::Error> {
-    let env = env_logger::Env::new().filter_or("LOG", "info");
-    env_logger::init_from_env(env);
+    log::with_level(
+        std::env::var("LOG")
+            .unwrap_or_else(|_| "info".into())
+            .parse()
+            .unwrap(),
+    );
 
     let db = db::new().unwrap();