From 54035ca467789b6218008b3d94c4aa40214a3a35 Mon Sep 17 00:00:00 2001
From: Rutger Broekhoff
Date: Wed, 24 Jan 2024 18:24:26 +0100
Subject: You wouldn't believe it, but it's time for another dependency

---
 rs/Cargo.lock         | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 rs/server/Cargo.toml  |  1 +
 rs/server/src/main.rs |  1 +
 3 files changed, 61 insertions(+), 1 deletion(-)

(limited to 'rs')

diff --git a/rs/Cargo.lock b/rs/Cargo.lock
index f3beb9e..d5a8108 100644
--- a/rs/Cargo.lock
+++ b/rs/Cargo.lock
@@ -52,6 +52,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -762,6 +773,19 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -928,6 +952,15 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.3"
@@ -1023,6 +1056,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "0.14.28"
@@ -1278,7 +1317,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.3",
  "libc",
 ]
 
@@ -1715,6 +1754,7 @@ dependencies = [
  "base64",
  "chrono",
  "common",
+ "env_logger",
  "mime",
  "serde",
  "serde_json",
@@ -1842,6 +1882,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.7"
@@ -2204,6 +2253,15 @@ 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"
diff --git a/rs/server/Cargo.toml b/rs/server/Cargo.toml
index edb76d8..0572cac 100644
--- a/rs/server/Cargo.toml
+++ b/rs/server/Cargo.toml
@@ -10,6 +10,7 @@ axum = "0.7"
 base64 = "0.21"
 chrono = { version = "0.4", features = ["serde"] }
 common = { path = "../common" }
+env_logger = "0.9.0"
 mime = "0.3"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/rs/server/src/main.rs b/rs/server/src/main.rs
index b346bc6..e816dde 100644
--- a/rs/server/src/main.rs
+++ b/rs/server/src/main.rs
@@ -160,6 +160,7 @@ fn get_s3_client(env: &Env) -> Result<aws_sdk_s3::Client, std::io::Error> {
 
 #[tokio::main]
 async fn main() -> ExitCode {
+    env_logger::init();
     tracing_subscriber::fmt::init();
 
     let env = match Env::load() {
-- 
cgit v1.2.3