Message style improvements

petere · petere · commit faee8f1a714f · 2013-07-28T06:59:09.000-04:00
diff --git a/src/backend/access/transam/timeline.c b/src/backend/access/transam/timeline.c
@@ -150,7 +150,7 @@ readTimeLineHistory(TimeLineID targetTLI)
 		if (nfields != 3)
 			ereport(FATAL,
 					(errmsg("syntax error in history file: %s", fline),
-					 errhint("Expected an XLOG switchpoint location.")));
+					 errhint("Expected a transaction log switchpoint location.")));
 
 		if (result && tli <= lasttli)
 			ereport(FATAL,
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -2608,7 +2608,7 @@ XLogFileOpen(XLogSegNo segno)
 	if (fd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
-				 errmsg("could not open xlog file \"%s\": %m", path)));
+				 errmsg("could not open transaction log file \"%s\": %m", path)));
 
 	return fd;
 }
@@ -5140,7 +5140,7 @@ StartupXLOG(void)
 		ereport(FATAL,
 				(errmsg("requested timeline %u is not a child of this server's history",
 						recoveryTargetTLI),
-				 errdetail("Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X",
+				 errdetail("Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X.",
 						   (uint32) (ControlFile->checkPoint >> 32),
 						   (uint32) ControlFile->checkPoint,
 						   ControlFile->checkPointCopy.ThisTimeLineID,
@@ -7873,7 +7873,7 @@ checkTimeLineSwitch(XLogRecPtr lsn, TimeLineID newTLI, TimeLineID prevTLI)
 	/* Check that the record agrees on what the current (old) timeline is */
 	if (prevTLI != ThisTimeLineID)
 		ereport(PANIC,
-				(errmsg("unexpected prev timeline ID %u (current timeline ID %u) in checkpoint record",
+				(errmsg("unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record",
 						prevTLI, ThisTimeLineID)));
 
 	/*
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -5185,7 +5185,7 @@ RegisterBackgroundWorker(BackgroundWorker *worker)
 			if (!IsUnderPostmaster)
 				ereport(LOG,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("background worker \"%s\": must attach to shared memory in order to request a database connection",
+						 errmsg("background worker \"%s\": must attach to shared memory in order to be able to request a database connection",
 								worker->bgw_name)));
 			return;
 		}
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
@@ -438,7 +438,7 @@ WalReceiverMain(void)
 						{
 							ereport(LOG,
 									(errmsg("replication terminated by primary server"),
-									 errdetail("End of WAL reached on timeline %u at %X/%X",
+									 errdetail("End of WAL reached on timeline %u at %X/%X.",
 											   startpointTLI,
 											   (uint32) (LogstreamResult.Write >> 32), (uint32) LogstreamResult.Write)));
 							endofwal = true;
@@ -927,7 +927,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
 			if (lseek(recvFile, (off_t) startoff, SEEK_SET) < 0)
 				ereport(PANIC,
 						(errcode_for_file_access(),
-				 errmsg("could not seek in log segment %s, to offset %u: %m",
+				 errmsg("could not seek in log segment %s to offset %u: %m",
 						XLogFileNameP(recvFileTLI, recvSegNo),
 						startoff)));
 			recvOff = startoff;
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -485,7 +485,7 @@ StartReplication(StartReplicationCmd *cmd)
 								(uint32) (cmd->startpoint >> 32),
 								(uint32) (cmd->startpoint),
 								cmd->timeline),
-						 errdetail("This server's history forked from timeline %u at %X/%X",
+						 errdetail("This server's history forked from timeline %u at %X/%X.",
 								   cmd->timeline,
 								   (uint32) (switchpoint >> 32),
 								   (uint32) (switchpoint))));

Original file line number	Diff line number	Diff line change
`@@ -5185,7 +5185,7 @@ RegisterBackgroundWorker(BackgroundWorker *worker)`
`5185`	`5185`	`if (!IsUnderPostmaster)`
`5186`	`5186`	`ereport(LOG,`
`5187`	`5187`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`5188`		`- errmsg("background worker \"%s\": must attach to shared memory in order to request a database connection",`
	`5188`	`+ errmsg("background worker \"%s\": must attach to shared memory in order to be able to request a database connection",`
`5189`	`5189`	`worker->bgw_name)));`
`5190`	`5190`	`return;`
`5191`	`5191`	`}`