diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-03-31 15:25:53 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-03-31 15:25:53 -0400 |
| commit | 6197db5340b8154adce1c6d07f6d3325547429c1 (patch) | |
| tree | 56ace98b58720de30c2a9040d01f1a13f85a4f72 /src/backend/commands/subscriptioncmds.c | |
| parent | db973ffb3ca43e65a0bf15175a35184a53bf977d (diff) | |
| download | postgresql-6197db5340b8154adce1c6d07f6d3325547429c1.tar.gz postgresql-6197db5340b8154adce1c6d07f6d3325547429c1.zip | |
Improve style of some replication-related error messages.
Put the remote end's error message into the primary error string,
instead of relegating it to errdetail(). Although this could end up
being awkward if the remote sends us a really long error message,
it seems more in keeping with our message style guidelines, and more
helpful in situations where the errdetail could get dropped.
Peter Smith
Discussion: https://postgr.es/m/CAHut+Ps-Qv2yQceCwobQDP0aJOkfDzRFrOaR6+2Op2K=WHGeWg@mail.gmail.com
Diffstat (limited to 'src/backend/commands/subscriptioncmds.c')
| -rw-r--r-- | src/backend/commands/subscriptioncmds.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c index bfd3514546a..5282b797359 100644 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@ -1320,17 +1320,15 @@ ReplicationSlotDropAtPubNode(WalReceiverConn *wrconn, char *slotname, bool missi { /* LOG. Error, but missing_ok = true. */ ereport(LOG, - (errmsg("could not drop the replication slot \"%s\" on publisher", - slotname), - errdetail("The error was: %s", res->err))); + (errmsg("could not drop replication slot \"%s\" on publisher: %s", + slotname, res->err))); } else { /* ERROR. */ ereport(ERROR, - (errmsg("could not drop the replication slot \"%s\" on publisher", - slotname), - errdetail("The error was: %s", res->err))); + (errmsg("could not drop replication slot \"%s\" on publisher: %s", + slotname, res->err))); } walrcv_clear_result(res); @@ -1545,8 +1543,7 @@ ReportSlotConnectionError(List *rstates, Oid subid, char *slotname, char *err) ereport(ERROR, (errmsg("could not connect to publisher when attempting to " - "drop the replication slot \"%s\"", slotname), - errdetail("The error was: %s", err), + "drop replication slot \"%s\": %s", slotname, err), /* translator: %s is an SQL ALTER command */ errhint("Use %s to disassociate the subscription from the slot.", "ALTER SUBSCRIPTION ... SET (slot_name = NONE)"))); |