From b0a723475957aba4dcc31124347b311bfe666707 Mon Sep 17 00:00:00 2001 From: Egor Suvorov Date: Fri, 24 Sep 2021 19:58:25 +0000 Subject: [PATCH] pageserver: fix stale default listen addrs * In command line help * In dummy_conf --- pageserver/src/bin/pageserver.rs | 11 +++++++---- pageserver/src/lib.rs | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pageserver/src/bin/pageserver.rs b/pageserver/src/bin/pageserver.rs index efe4b414f5..cf7378cbb7 100644 --- a/pageserver/src/bin/pageserver.rs +++ b/pageserver/src/bin/pageserver.rs @@ -20,11 +20,14 @@ use clap::{App, Arg, ArgMatches}; use daemonize::Daemonize; use pageserver::{ - branches, http, page_service, tenant_mgr, PageServerConf, RelishStorageConfig, S3Config, - LOG_FILE_NAME, + branches, + defaults::{DEFAULT_HTTP_LISTEN_ADDR, DEFAULT_PG_LISTEN_ADDR}, + http, page_service, tenant_mgr, PageServerConf, RelishStorageConfig, S3Config, LOG_FILE_NAME, }; use zenith_utils::http::endpoint; +use const_format::formatcp; + /// String arguments that can be declared via CLI or config file #[derive(Serialize, Deserialize)] struct CfgFileParams { @@ -228,14 +231,14 @@ fn main() -> Result<()> { .long("listen-pg") .alias("listen") // keep some compatibility .takes_value(true) - .help("listen for incoming page requests on ip:port (default: 127.0.0.1:5430)"), + .help(formatcp!("listen for incoming page requests on ip:port (default: {DEFAULT_PG_LISTEN_ADDR})")), ) .arg( Arg::with_name("listen-http") .long("listen-http") .alias("http_endpoint") // keep some compatibility .takes_value(true) - .help("http endpoint address for metrics and management API calls ip:port (default: 127.0.0.1:5430)"), + .help(formatcp!("http endpoint address for metrics and management API calls on ip:port (default: {DEFAULT_HTTP_LISTEN_ADDR})")), ) .arg( Arg::with_name("daemonize") diff --git a/pageserver/src/lib.rs b/pageserver/src/lib.rs index b4745e54db..2da82c5bde 100644 --- a/pageserver/src/lib.rs +++ b/pageserver/src/lib.rs @@ -154,8 +154,8 @@ impl PageServerConf { checkpoint_period: Duration::from_secs(10), gc_horizon: defaults::DEFAULT_GC_HORIZON, gc_period: Duration::from_secs(10), - listen_pg_addr: "127.0.0.1:5430".to_string(), - listen_http_addr: "127.0.0.1:9898".to_string(), + listen_pg_addr: defaults::DEFAULT_PG_LISTEN_ADDR.to_string(), + listen_http_addr: defaults::DEFAULT_HTTP_LISTEN_ADDR.to_string(), superuser: "zenith_admin".to_string(), workdir: repo_dir, pg_distrib_dir: "".into(),