From 551c07d84ae2f0d3b7dde68e52322edf9cb87ba5 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Thu, 10 Mar 2011 16:24:52 -0500 Subject: [PATCH] Make error handling of synchronous_standby_names consistent. It's not a good idea to kill the postmaster just because someone muffs this, and it's not consistent with what we do for other, similar GUCs. Fujii Masao, with a bit more hacking by me --- src/backend/replication/syncrep.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index 07dd235540..3ef9cdd87c 100644 --- a/src/backend/replication/syncrep.c +++ b/src/backend/replication/syncrep.c @@ -420,9 +420,7 @@ SyncRepGetStandbyPriority(void) /* syntax error in list */ pfree(rawstring); list_free(elemlist); - ereport(FATAL, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid list syntax for parameter \"synchronous_standby_names\""))); + /* GUC machinery will have already complained - no need to do again */ return 0; } @@ -563,7 +561,7 @@ assign_synchronous_standby_names(const char *newval, bool doit, GucSource source /* syntax error in list */ pfree(rawstring); list_free(elemlist); - ereport(FATAL, + ereport(GUC_complaint_elevel(source), (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("invalid list syntax for parameter \"synchronous_standby_names\""))); return NULL;