Minor edits.
authorRobert Haas <[email protected]>
Tue, 28 Jan 2014 16:16:18 +0000 (11:16 -0500)
committerRobert Haas <[email protected]>
Tue, 28 Jan 2014 16:16:18 +0000 (11:16 -0500)
src/backend/replication/slot.c

index 44c2b5a1ef7f824b651359ae9d4b03cb3e0096a2..e741fd5dc93db3e9937c3af7605590c4c6ad8335 100644 (file)
@@ -586,12 +586,12 @@ CheckSlotRequirements(void)
        if (max_replication_slots == 0)
                ereport(ERROR,
                                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                (errmsg("replication slot usage requires max_replication_slots > 0"))));
+                                (errmsg("replication slots can only be used if max_replication_slots > 0"))));
 
        if (wal_level < WAL_LEVEL_ARCHIVE)
                ereport(ERROR,
                                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                errmsg("replication slot usage requires wal_level >= archive")));
+                                errmsg("replication slots can only be used i wal_level >= archive")));
 }
 
 /*
@@ -650,8 +650,7 @@ StartupReplicationSlots(XLogRecPtr checkPointRedo)
                        {
                                ereport(WARNING,
                                                (errcode_for_file_access(),
-                                                errmsg("could not remove directory \"%s\"", path),
-                                                errmsg("some useless files may be left behind in that directory preventing creation of new slots")));
+                                                errmsg("could not remove directory \"%s\"", path)));
                                continue;
                        }
                        fsync_fname("pg_replslot", true);
@@ -699,12 +698,10 @@ CreateSlotOnDisk(ReplicationSlot *slot)
        SaveSlotToPath(slot, tmppath);
 
        if (rename(tmppath, path) != 0)
-       {
                ereport(ERROR,
                                (errcode_for_file_access(),
                                 errmsg("could not rename file \"%s\" to \"%s\": %m",
                                                tmppath, path)));
-       }
 
        /*
         * If we'd now fail - really unlikely - we wouldn't know wether this slot