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

Potential fix to #1626. Fixed typo is Makefile. (#1781)

Browse Source 
* Potential fix to #1626. Fixed typo is Makefile.
* Completed fix to #1626.

Summary:
changed 'error' to 'bail' in start_pageserver and start_safekeeper.
This commit is contained in:
KlimentSerafimov
2022-05-24 04:55:38 -04:00
committed by GitHub
parent 2aceb6a309
commit 8346aa3a29
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -20,7 +20,7 @@ else ifeq ($(BUILD_TYPE),debug)
PG_CONFIGURE_OPTS = --enable-debug --with-openssl --enable-cassert --enable-depend PG_CONFIGURE_OPTS = --enable-debug --with-openssl --enable-cassert --enable-depend
PG_CFLAGS = -O0 -g3 $(CFLAGS) PG_CFLAGS = -O0 -g3 $(CFLAGS)
else else
$(error Bad build type `$(BUILD_TYPE)', see Makefile for options) $(error Bad build type '$(BUILD_TYPE)', see Makefile for options)
endif endif
# macOS with brew-installed openssl requires explicit paths # macOS with brew-installed openssl requires explicit paths

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

@@ -254,7 +254,7 @@ fn start_pageserver(conf: &'static PageServerConf, daemonize: bool) -> Result<()
// Otherwise, the coverage data will be damaged. // Otherwise, the coverage data will be damaged.
match daemonize.exit_action(|| exit_now(0)).start() { match daemonize.exit_action(|| exit_now(0)).start() {
Ok(_) => info!("Success, daemonized"), Ok(_) => info!("Success, daemonized"),
Err(err) => error!(%err, "could not daemonize"), Err(err) => bail!("{err}. could not daemonize. bailing."),
} }
} }

2
safekeeper/src/bin/safekeeper.rs
View File

@@ -245,7 +245,7 @@ fn start_safekeeper(mut conf: SafeKeeperConf, given_id: Option<ZNodeId>, init: b
// Otherwise, the coverage data will be damaged. // Otherwise, the coverage data will be damaged.
match daemonize.exit_action(|| exit_now(0)).start() { match daemonize.exit_action(|| exit_now(0)).start() {
Ok(_) => info!("Success, daemonized"), Ok(_) => info!("Success, daemonized"),
Err(e) => error!("Error, {}", e), Err(err) => bail!("Error: {err}. could not daemonize. bailing."),
} }
} }