rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-08 05:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up the code to create PageServerConf

Browse Source 
Parse all the command line options before calling "zenith init" and
changing current working dir. The rest of the options don't make any
difference if we're initializing a new repository, but it seems strange
and error-prone to parse some arguments at different times.
This commit is contained in:
Heikki Linnakangas
2021-05-20 19:28:57 +03:00
parent c1bfa32771
commit ecf2d181c4
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pageserver/src/bin/pageserver.rs
View File

@@ -108,15 +108,6 @@ fn main() -> Result<()> {
pg_distrib_dir,
};
// Create repo and exit if init was requested
if arg_matches.is_present("init") {
branches::init_repo(&conf, &workdir)?;
return Ok(());
}
// Set CWD to workdir for non-daemon modes
env::set_current_dir(&workdir)?;
if arg_matches.is_present("daemonize") {
conf.daemonize = true;
}
@@ -142,9 +133,21 @@ fn main() -> Result<()> {
conf.gc_period = parse(period)?;
}
let leaked: &'static PageServerConf = Box::leak(Box::new(conf));
// The configuration is all set up now. Turn it into a 'static
// that can be freely stored in structs and passed across threads
// as a ref.
let conf: &'static PageServerConf = Box::leak(Box::new(conf));
start_pageserver(leaked)
// Create repo and exit if init was requested
if arg_matches.is_present("init") {
branches::init_repo(conf, &workdir)?;
return Ok(());
}
// Set CWD to workdir for non-daemon modes
env::set_current_dir(&workdir)?;
start_pageserver(conf)
}
fn start_pageserver(conf: &'static PageServerConf) -> Result<()> {