From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 5 Sep 2020 18:29:26 +0000 (+0100)
Subject: parse log config
X-Git-Tag: otter-0.2.0~1020
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bfb0f3ec2f7721868b5e46b04b2045dea28be017;p=otter.git

parse log config

see also
https://github.com/emabee/flexi_logger/pull/66
---

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 431ed268..33936dec 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -380,8 +380,6 @@ dependencies = [
 [[package]]
 name = "flexi_logger"
 version = "0.15.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaab3caedb4149800f91e8e4899f29cd9ddf3b569b04c365ca9334f92f7542bf"
 dependencies = [
  "atty",
  "chrono",
diff --git a/src/global.rs b/src/global.rs
index b0007e81..ca143c26 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -935,7 +935,7 @@ pub struct ServerConfigSpec {
   pub http_port: Option<u16>,
   pub rocket_workers: Option<u16>,
   pub template_dir: Option<String>,
-  pub log: toml::Value,
+  pub log: Option<toml::Value>,
 }
 
 #[derive(Debug,Clone)]
@@ -974,6 +974,17 @@ impl TryFrom<ServerConfigSpec> for ServerConfig {
     let template_dir = template_dir
       .unwrap_or_else(|| DEFAULT_TEMPLATE_DIR.to_owned());
 
+    let log = {
+      use toml::Value::Table;
+      match log {
+        None => Table(Default::default()),
+        Some(log @Table(_)) => log,
+        Some(x) => throw!(anyhow!(
+          r#"wanted table for "log" config key, not {}"#,
+          x.type_str())
+        ),
+      }
+    };
     let log = toml::to_string(&log)?;
     let log = LogSpecification::from_toml(&log)
       .context("log specification")?;