g3proxy: make source config in proxy_float escaper optional

bytedance · Aug 19, 2023 · bbf8459 · bbf8459
1 parent 43f79d1
commit bbf8459
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/g3proxy/doc/configuration/escapers/proxy_float.rst b/g3proxy/doc/configuration/escapers/proxy_float.rst
@@ -43,13 +43,15 @@ The following common keys are supported:
 source
 ------
 
-**required**, **type**: :ref:`url str <conf_value_url_str>` | map | null
+**optional**, **type**: :ref:`url str <conf_value_url_str>` | map | null
 
 Set the fetch source for peers.
 
 We support many type of sources. The type is detected by reading the *scheme* field of url,
 or the *type* key of the map. See :ref:`sources <config_escaper_dynamic_source>` for all supported type of sources.
 
+**default**: passive
+
 cache
 -----
 

diff --git a/g3proxy/src/config/escaper/proxy_float/mod.rs b/g3proxy/src/config/escaper/proxy_float/mod.rs
@@ -46,7 +46,7 @@ pub(crate) struct ProxyFloatEscaperConfig {
     pub(crate) bind_v4: Option<IpAddr>,
     pub(crate) bind_v6: Option<IpAddr>,
     pub(crate) tls_config: Option<OpensslTlsClientConfigBuilder>,
-    pub(crate) source: Option<ProxyFloatSource>,
+    pub(crate) source: ProxyFloatSource,
     pub(crate) cache_file: Option<PathBuf>,
     pub(crate) refresh_interval: Duration,
     pub(crate) tcp_connect_timeout: Duration,
@@ -67,7 +67,7 @@ impl ProxyFloatEscaperConfig {
             bind_v4: None,
             bind_v6: None,
             tls_config: None,
-            source: None,
+            source: ProxyFloatSource::Passive,
             cache_file: None,
             refresh_interval: Duration::from_secs(1),
             tcp_connect_timeout: Duration::from_secs(30),
@@ -141,7 +141,7 @@ impl ProxyFloatEscaperConfig {
             }
             "source" => {
                 self.source =
-                    Some(ProxyFloatSource::parse(v).context(format!("invalid value for key {k}"))?);
+                    ProxyFloatSource::parse(v).context(format!("invalid value for key {k}"))?;
                 Ok(())
             }
             "cache" => {
@@ -197,15 +197,11 @@ impl ProxyFloatEscaperConfig {
         if self.name.is_empty() {
             return Err(anyhow!("name is not set"));
         }
-        if let Some(source) = &self.source {
-            if source.need_local_cache() && self.cache_file.is_none() {
-                warn!(
-                    "It is very recommended to set local cache for escaper {}",
-                    self.name
-                );
-            }
-        } else {
-            return Err(anyhow!("no source url set"));
+        if self.source.need_local_cache() && self.cache_file.is_none() {
+            warn!(
+                "It is very recommended to set local cache for escaper {}",
+                self.name
+            );
         }
 
         Ok(())

diff --git a/g3proxy/src/escape/proxy_float/source/mod.rs b/g3proxy/src/escape/proxy_float/source/mod.rs
@@ -99,19 +99,11 @@ pub(super) fn new_job(
     peers_container: Arc<ArcSwap<Box<[ArcNextProxyPeer]>>>,
     tls_config: Option<Arc<OpensslTlsClientConfig>>,
 ) -> anyhow::Result<AbortHandle> {
-    if config.source.is_none() {
-        return Err(anyhow!("no source set"));
-    }
-
     let f = async move {
-        let source = match &config.source {
-            Some(source) => source,
-            None => unreachable!(),
-        };
         let mut interval = tokio::time::interval(config.refresh_interval);
         interval.tick().await; // will tick immediately
         loop {
-            let result = match source {
+            let result = match &config.source {
                 ProxyFloatSource::Passive => {
                     // do nothing
                     interval.tick().await;