From b611e395a2d002c0696c2c10e2f43b3f9013c6d9 Mon Sep 17 00:00:00 2001
From: Keuin <keuinx@gmail.com>
Date: Mon, 28 Mar 2022 00:06:58 +0800
Subject: Decent logging. Configurable log level.

---
 src/config.rs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/config.rs')

diff --git a/src/config.rs b/src/config.rs
index c5d07a7..99e5f3d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -2,6 +2,7 @@ use std::fs::File;
 use std::io::Read;
 
 use serde_derive::Deserialize;
+use tracing::error;
 
 #[derive(Deserialize)]
 pub struct Config {
@@ -9,17 +10,26 @@ pub struct Config {
     pub log_file: String,
     pub db_file: String,
     pub listen: String,
+    pub log_level: String,
 }
 
 impl Config {
     // Read config file. Panic if any error occurs.
     pub fn from_file(file_path: &str) -> Config {
         let mut file = File::open(file_path)
-            .unwrap_or_else(|_| panic!("cannot open file {}", file_path));
+            .unwrap_or_else(|err| {
+                error!("Cannot open config file {}: {:?}", file_path, err);
+                panic!();
+            });
         let mut config = String::new();
         file.read_to_string(&mut config)
-            .unwrap_or_else(|_| panic!("cannot read config file {}", file_path));
-        return serde_json::from_str(config.as_str())
-            .expect("cannot decode config file in JSON");
+            .unwrap_or_else(|err| {
+                error!("Cannot read config file {}: {:?}.", file_path, err);
+                panic!();
+            });
+        return serde_json::from_str(config.as_str()).unwrap_or_else(|err| {
+            error!("Cannot decode config file: {:?}.", err);
+            panic!();
+        });
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3