diff options
| author | Robert Haas <rhaas@postgresql.org> | 2011-03-10 16:24:52 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2011-03-10 16:24:52 -0500 |
| commit | 551c07d84ae2f0d3b7dde68e52322edf9cb87ba5 (patch) | |
| tree | 513e377d6f0f062bb6f87604596625238a3f5565 /src | |
| parent | 2e019c8611654175780db488d81cc2dc8311f22e (diff) | |
| download | postgresql-551c07d84ae2f0d3b7dde68e52322edf9cb87ba5.tar.gz postgresql-551c07d84ae2f0d3b7dde68e52322edf9cb87ba5.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/replication/syncrep.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index 07dd2355403..3ef9cdd87c3 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; |