fix: simplify config

conblem · Jan 16, 2021 · 6c02fce · 6c02fce
1 parent 9fcda0b
commit 6c02fce
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 41 deletions.
diff --git a/src/api/mod.rs b/src/api/mod.rs
@@ -24,9 +24,9 @@ pub struct Api<H, P, S> {
 }
 
 pub async fn new(
-    Listener(http, http_proxy): Listener,
-    Listener(https, https_proxy): Listener,
-    Listener(prom, prom_proxy): Listener,
+    (http, http_proxy): Listener,
+    (https, https_proxy): Listener,
+    (prom, prom_proxy): Listener,
     pool: PgPool,
 ) -> Result<
     Api<

diff --git a/src/config/listener.rs b/src/config/listener.rs
@@ -26,49 +26,39 @@ impl Default for ProxyProtocol {
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct Listener(pub Option<String>, pub ProxyProtocol);
+pub type Listener = (Option<String>, ProxyProtocol);
 
-impl<'de> Deserialize<'de> for Listener {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        struct ListenerVisitor;
-        impl<'de> Visitor<'de> for ListenerVisitor {
-            type Value = Listener;
+pub(super) fn deserialize<'de, D>(deserializer: D) -> Result<Listener, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    struct ListenerVisitor;
+    impl<'de> Visitor<'de> for ListenerVisitor {
+        type Value = Listener;
 
-            fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
-                formatter.write_str("Listener")
-            }
-
-            fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
-            where
-                E: serde::de::Error,
-            {
-                Ok(Listener(
-                    String::from(value).into(),
-                    ProxyProtocol::Disabled,
-                ))
-            }
+        fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
+            formatter.write_str("Listener")
+        }
 
-            fn visit_none<E>(self) -> Result<Self::Value, E>
-            where
-                E: serde::de::Error,
-            {
-                Ok(Listener(None, ProxyProtocol::Disabled))
-            }
+        fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+        where
+            E: serde::de::Error,
+        {
+            Ok((
+                String::from(value).into(),
+                ProxyProtocol::Disabled,
+            ))
+        }
 
-            fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
-            where
-                A: SeqAccess<'de>,
-            {
-                let listener = seq.next_element::<String>()?;
-                let proxy = seq.next_element::<ProxyProtocol>()?.unwrap_or_default();
+        fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+        where
+            A: SeqAccess<'de>,
+        {
+            let listener = seq.next_element::<String>()?;
+            let proxy = seq.next_element::<ProxyProtocol>()?.unwrap_or_default();
 
-                Ok(Listener(listener, proxy))
-            }
+            Ok((listener, proxy))
         }
-        deserializer.deserialize_any(ListenerVisitor)
     }
+    deserializer.deserialize_any(ListenerVisitor)
 }
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -12,8 +12,11 @@ mod records;
 
 #[derive(Deserialize, Debug)]
 pub struct Api {
+    #[serde(default, deserialize_with = "listener::deserialize")]
     pub http: Listener,
+    #[serde(default, deserialize_with = "listener::deserialize")]
     pub https: Listener,
+    #[serde(default, deserialize_with = "listener::deserialize")]
     pub prom: Listener,
 }