소스 검색

net/settings: use default value for hostlist if not present in args/config

aggstam 2 년 전
부모
커밋
613f3b3445
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      src/net/settings.rs

+ 2 - 2
src/net/settings.rs

@@ -209,7 +209,7 @@ pub struct SettingsOpt {
     /// Hosts .tsv file to use
     /// Hosts .tsv file to use
     #[serde(default)]
     #[serde(default)]
     #[structopt(long)]
     #[structopt(long)]
-    pub hostlist: String,
+    pub hostlist: Option<String>,
 
 
     /// Pause interval within greylist refinery process
     /// Pause interval within greylist refinery process
     #[structopt(skip)]
     #[structopt(skip)]
@@ -260,7 +260,7 @@ impl From<SettingsOpt> for Settings {
                 .outbound_peer_discovery_attempt_time
                 .outbound_peer_discovery_attempt_time
                 .unwrap_or(def.outbound_peer_discovery_attempt_time),
                 .unwrap_or(def.outbound_peer_discovery_attempt_time),
             advertise: opt.advertise,
             advertise: opt.advertise,
-            hostlist: opt.hostlist,
+            hostlist: opt.hostlist.unwrap_or(def.hostlist),
             greylist_refinery_interval: opt
             greylist_refinery_interval: opt
                 .greylist_refinery_interval
                 .greylist_refinery_interval
                 .unwrap_or(def.greylist_refinery_interval),
                 .unwrap_or(def.greylist_refinery_interval),