From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 31 Jan 2021 16:47:57 +0000 (+0000)
Subject: config: Allow OTTER_LOG to partially override config
X-Git-Tag: otter-0.4.0~610
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=be2f9ced2e95ee1ec9c8755c69056574443ab2eb;p=otter.git

config: Allow OTTER_LOG to partially override config

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/config.rs b/src/config.rs
index 8a566ad7..cc0588cd 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -151,13 +151,11 @@ impl TryFrom<ServerConfigSpec> for WholeServerConfig {
           v.to_toml(&mut buf).context("convert to toml")?;
           let v = toml_de::from_slice(&buf).context("reparse")?;
           dbg!(&v);
-          let v = match v {
-            Some(Table(v)) => v,
+          match v {
+            Some(Table(v)) => toml_merge(&mut log, &v),
             None => default(),
             Some(x) => throw!(anyhow!("reparse gave {:?}, no table", x)),
           };
-          dbg!(&v);
-          log.extend(v);
         }
         Ok::<_,AE>(())
       })()