Directory cli fixes (payjoin#1157)

Author: spacebear21

payjoin-directory/src/cli.rs

@@ -1,7 +1,7 @@
 use std::env;
 use std::path::PathBuf;
 
-use clap::{value_parser, Parser};
+use clap::Parser;
 
 #[derive(Debug, Parser)]
 #[command(
@@ -10,44 +10,30 @@ use clap::{value_parser, Parser};
     long_about = None,
 )]
 pub struct Cli {
-    #[arg(
-        long,
-        short = 'p',
-        env = "PJ_DIR_PORT",
-        default_value = "8080",
-        help = "The port to bind"
-    )]
-    pub port: u16, // TODO tokio_listener::ListenerAddressLFlag
+    #[arg(long, short = 'p', env = "PJ_DIR_PORT", help = "The port to bind [default: 8080]")]
+    pub port: Option<u16>, // TODO tokio_listener::ListenerAddressLFlag
 
-    #[arg(
-        long,
-        env = "PJ_METRIC_PORT",
-        default_value = "9090",
-        help = "The port to bind for prometheus metrics export"
-    )]
-    pub metrics_port: u16, // TODO tokio_listener::ListenerAddressLFlag
+    #[arg(long, env = "PJ_METRIC_PORT", help = "The port to bind for prometheus metrics export")]
+    pub metrics_port: Option<u16>, // TODO tokio_listener::ListenerAddressLFlag
 
     #[arg(
         long,
         env = "PJ_DIR_TIMEOUT_SECS",
-        default_value = "30",
-        help = "The timeout for long polling operations"
+        help = "The timeout for long polling operations [default: 30]"
     )]
-    pub timeout: u64,
+    pub timeout: Option<u64>,
 
     #[arg(
         long = "storage-dir",
         env = "PJ_STORAGE_DIR",
         help = "A directory for writing mailbox data."
     )]
-    pub storage_dir: PathBuf,
+    pub storage_dir: Option<PathBuf>,
 
     #[arg(
         long = "ohttp-keys",
         env = "PJ_OHTTP_KEY_DIR",
-        help = "The ohttp key config file path",
-        default_value = "ohttp_keys",
-        value_parser = value_parser!(PathBuf)
+        help = "The ohttp key config file path [default: ohttp_keys]"
     )]
-    pub ohttp_keys: PathBuf,
+    pub ohttp_keys: Option<PathBuf>,
 }

payjoin-directory/src/config.rs

@@ -12,8 +12,8 @@ use crate::cli::Cli;
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct Config {
-    pub listen_addr: String,         // TODO tokio_listener::ListenerAddressLFlag
-    pub metrics_listen_addr: String, // TODO tokio_listener::ListenerAddressLFlag
+    pub listen_addr: String, // TODO tokio_listener::ListenerAddressLFlag
+    pub metrics_listen_addr: Option<String>, // TODO tokio_listener::ListenerAddressLFlag
     pub timeout: Duration,
     pub storage_dir: PathBuf,
     pub ohttp_keys: PathBuf, // TODO OhttpConfig struct with rotation params, etc
@@ -31,7 +31,7 @@ impl Config {
 
         Ok(Config {
             listen_addr: built_config.get("listen_addr")?,
-            metrics_listen_addr: built_config.get("metrics_listen_addr")?,
+            metrics_listen_addr: built_config.get("metrics_listen_addr").ok(),
             timeout: Duration::from_secs(built_config.get("timeout")?),
             storage_dir: built_config.get("storage_dir")?,
             ohttp_keys: built_config.get("ohttp_keys")?,
@@ -41,12 +41,22 @@ impl Config {
 
 fn add_defaults(config: Builder, cli: &Cli) -> Result<Builder, ConfigError> {
     config
-        .set_override_option("listen_addr", Some(format!("[::]:{}", cli.port)))?
+        .set_default("listen_addr", "[::]:8080")?
+        .set_override_option("listen_addr", cli.port.map(|port| format!("[::]:{}", port)))?
+        .set_default("metrics_listen_addr", Option::<String>::None)?
         .set_override_option(
             "metrics_listen_addr",
-            Some(format!("localhost:{}", cli.metrics_port)),
+            cli.metrics_port.map(|port| format!("localhost:{}", port)),
         )?
-        .set_override_option("timeout", Some(cli.timeout))?
-        .set_override_option("ohttp_keys", Some(cli.ohttp_keys.to_string_lossy().into_owned()))?
-        .set_override_option("storage_dir", Some(cli.storage_dir.to_string_lossy().into_owned()))
+        .set_default("timeout", Some(30))?
+        .set_override_option("timeout", cli.timeout)?
+        .set_default("ohttp_keys", "ohttp_keys")?
+        .set_override_option(
+            "ohttp_keys",
+            cli.ohttp_keys.clone().map(|s| s.to_string_lossy().into_owned()),
+        )?
+        .set_override_option(
+            "storage_dir",
+            cli.storage_dir.clone().map(|s| s.to_string_lossy().into_owned()),
+        )
 }

payjoin-directory/src/main.rs

@@ -32,6 +32,11 @@ async fn main() -> Result<(), BoxError> {
 
     let service = Service::new(db, ohttp.into(), metrics);
 
+    if let Some(addr) = config.metrics_listen_addr {
+        let metrics_listener = TcpListener::bind(addr).await?;
+        service.serve_metrics_tcp(metrics_listener).await?;
+    }
+
     let listener = TcpListener::bind(config.listen_addr).await?;
     service.serve_tcp(listener).await
 }