diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2014-09-05 01:20:33 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2014-09-05 01:24:29 -0400 |
| commit | a6283f97069e6f747bdc2052e9f755a9136a5edc (patch) | |
| tree | bf75781e87f58fc93ffa6cbc55be5aff2d6a3d14 /src/backend/replication | |
| parent | 7695f9701a8bf46bf385c96bce2e216ee2ccf93e (diff) | |
Assorted message fixes and improvements
Diffstat (limited to 'src/backend/replication')
| -rw-r--r-- | src/backend/replication/logical/reorderbuffer.c | 4 | ||||
| -rw-r--r-- | src/backend/replication/logical/snapbuild.c | 6 | ||||
| -rw-r--r-- | src/backend/replication/slot.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 2b0929cb78b..ab09296763a 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -2350,7 +2350,7 @@ ReorderBufferRestoreCleanup(ReorderBuffer *rb, ReorderBufferTXN *txn) if (unlink(path) != 0 && errno != ENOENT) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not unlink file \"%s\": %m", path))); + errmsg("could not remove file \"%s\": %m", path))); } } @@ -2407,7 +2407,7 @@ StartupReorderBuffer(void) if (unlink(path) != 0) ereport(PANIC, (errcode_for_file_access(), - errmsg("could not unlink file \"%s\": %m", + errmsg("could not remove file \"%s\": %m", path))); } } diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c index 3319497603f..734fc2c5a52 100644 --- a/src/backend/replication/logical/snapbuild.c +++ b/src/backend/replication/logical/snapbuild.c @@ -1506,7 +1506,7 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn) if (unlink(tmppath) != 0 && errno != ENOENT) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not unlink file \"%s\": %m", path))); + errmsg("could not remove file \"%s\": %m", path))); needed_length = sizeof(SnapBuildOnDisk) + sizeof(TransactionId) * builder->running.xcnt_space + @@ -1857,7 +1857,7 @@ CheckPointSnapBuild(void) if (sscanf(snap_de->d_name, "%X-%X.snap", &hi, &lo) != 2) { ereport(LOG, - (errmsg("could not parse filename \"%s\"", path))); + (errmsg("could not parse file name \"%s\"", path))); continue; } @@ -1877,7 +1877,7 @@ CheckPointSnapBuild(void) { ereport(LOG, (errcode_for_file_access(), - errmsg("could not unlink file \"%s\": %m", + errmsg("could not remove file \"%s\": %m", path))); continue; } diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index b374c6eccf5..f355f13d293 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -183,7 +183,7 @@ ReplicationSlotValidateName(const char *name, int elevel) (errcode(ERRCODE_INVALID_NAME), errmsg("replication slot name \"%s\" contains invalid character", name), - errhint("Replication slot names may only contain letters, numbers and the underscore character."))); + errhint("Replication slot names may only contain letters, numbers, and the underscore character."))); return false; } } @@ -454,7 +454,7 @@ ReplicationSlotDropAcquired(void) ereport(fail_softly ? WARNING : ERROR, (errcode_for_file_access(), - errmsg("could not rename \"%s\" to \"%s\": %m", + errmsg("could not rename file \"%s\" to \"%s\": %m", path, tmppath))); } @@ -1041,7 +1041,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) { ereport(elevel, (errcode_for_file_access(), - errmsg("could not rename \"%s\" to \"%s\": %m", + errmsg("could not rename file \"%s\" to \"%s\": %m", tmppath, path))); return; } @@ -1092,7 +1092,7 @@ RestoreSlotFromDisk(const char *name) if (unlink(path) < 0 && errno != ENOENT) ereport(PANIC, (errcode_for_file_access(), - errmsg("could not unlink file \"%s\": %m", path))); + errmsg("could not remove file \"%s\": %m", path))); sprintf(path, "pg_replslot/%s/state", name); |