Merge pull request #182 from 56quarters/default-resolv

Use constant for default resolv.conf path in binaries
56quarters · Aug 18, 2024 · 17d66e8 · 17d66e8
2 parents 3cf2192 + 1dd6552
commit 17d66e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/mtop/src/bin/dns.rs b/mtop/src/bin/dns.rs
@@ -17,6 +17,7 @@ use tracing::{Instrument, Level};
 
 const DEFAULT_RECORD_TYPE: RecordType = RecordType::A;
 const DEFAULT_RECORD_CLASS: RecordClass = RecordClass::INET;
+const DEFAULT_RESOLV_CONF: &str = "/etc/resolv.conf";
 const MIN_PING_INTERVAL_SECS: f64 = 0.1;
 
 /// dns: Make DNS queries or read/write binary format DNS messages
@@ -58,7 +59,7 @@ struct PingCommand {
 
     /// Path to resolv.conf file for loading DNS configuration information. If this file
     /// can't be loaded, default values for DNS configuration are used instead.
-    #[arg(long, default_value = default_resolv_conf().into_os_string(), value_hint = ValueHint::FilePath)]
+    #[arg(long, default_value = DEFAULT_RESOLV_CONF, value_hint = ValueHint::FilePath)]
     resolv_conf: PathBuf,
 
     /// Nameserver to use for DNS queries, overriding whatever nameserver is configured in
@@ -97,7 +98,7 @@ fn parse_interval(s: &str) -> Result<f64, String> {
 struct QueryCommand {
     /// Path to resolv.conf file for loading DNS configuration information. If this file
     /// can't be loaded, default values for DNS configuration are used instead.
-    #[arg(long, default_value = default_resolv_conf().into_os_string(), value_hint = ValueHint::FilePath)]
+    #[arg(long, default_value = DEFAULT_RESOLV_CONF, value_hint = ValueHint::FilePath)]
     resolv_conf: PathBuf,
 
     /// Nameserver to use for DNS queries, overriding whatever nameserver is configured in
@@ -129,10 +130,6 @@ struct QueryCommand {
     name: Name,
 }
 
-fn default_resolv_conf() -> PathBuf {
-    PathBuf::from("/etc/resolv.conf")
-}
-
 /// Read a binary format DNS message from standard input and display it as dig-like text output.
 #[derive(Debug, Args)]
 struct ReadCommand {}

diff --git a/mtop/src/bin/mc.rs b/mtop/src/bin/mc.rs
@@ -29,7 +29,7 @@ struct McConfig {
 
     /// Path to resolv.conf file for loading DNS configuration information. If this file
     /// can't be loaded, default values for DNS configuration are used instead.
-    #[arg(long, env = "MC_RESOLV_CONF", default_value = default_resolv_conf().into_os_string(), value_hint = ValueHint::FilePath)]
+    #[arg(long, env = "MC_RESOLV_CONF", default_value = "/etc/resolv.conf", value_hint = ValueHint::FilePath)]
     resolv_conf: PathBuf,
 
     /// Memcached host to connect to in the form 'hostname:port'.
@@ -77,10 +77,6 @@ struct McConfig {
     mode: Action,
 }
 
-fn default_resolv_conf() -> PathBuf {
-    PathBuf::from("/etc/resolv.conf")
-}
-
 fn parse_server_name(s: &str) -> Result<ServerName<'static>, InvalidDnsNameError> {
     ServerName::try_from(s).map(|n| n.to_owned())
 }

diff --git a/mtop/src/bin/mtop.rs b/mtop/src/bin/mtop.rs
@@ -32,7 +32,7 @@ struct MtopConfig {
 
     /// Path to resolv.conf file for loading DNS configuration information. If this file
     /// can't be loaded, default values for DNS configuration are used instead.
-    #[arg(long, env = "MTOP_RESOLV_CONF", default_value = default_resolv_conf().into_os_string(), value_hint = ValueHint::FilePath)]
+    #[arg(long, env = "MTOP_RESOLV_CONF", default_value = "/etc/resolv.conf", value_hint = ValueHint::FilePath)]
     resolv_conf: PathBuf,
 
     /// Timeout for connecting to Memcached and fetching statistics, in seconds.
@@ -84,10 +84,6 @@ struct MtopConfig {
     hosts: Vec<String>,
 }
 
-fn default_resolv_conf() -> PathBuf {
-    PathBuf::from("/etc/resolv.conf")
-}
-
 fn parse_server_name(s: &str) -> Result<ServerName<'static>, InvalidDnsNameError> {
     ServerName::try_from(s).map(|n| n.to_owned())
 }