From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 31 Jan 2021 15:57:31 +0000 (+0000)
Subject: config: Refactor log setup into own block
X-Git-Tag: otter-0.4.0~614
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bfbae37093661ba52280ffb1aeec817de95620c4;p=otter.git

config: Refactor log setup into own block

We'll add stuff in a moment that modifies log while it's still a
`Table` rather than a `Value`.

NFC.

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

diff --git a/src/config.rs b/src/config.rs
index d763faa6..870e932e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -127,15 +127,19 @@ impl TryFrom<ServerConfigSpec> for WholeServerConfig {
 
     let log = {
       use toml::Value::Table;
-      match log {
-        None => Table(Default::default()),
-        Some(log @Table(_)) => log,
+
+      let log = match log {
+        Some(Table(log)) => log,
+        None => Default::default(),
         Some(x) => throw!(anyhow!(
           r#"wanted table for "log" config key, not {}"#,
           x.type_str())
         ),
-      }
+      };
+
+      Table(log)
     };
+
     let log = toml::to_string(&log)?;
     let log = LogSpecification::from_toml(&log)
       .context("log specification")?;