Clarify log messages

petere · petere · commit 5ca3d50db7a0 · 2007-12-13T11:55:44.000Z
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.548 2007/11/15 22:25:16 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.549 2007/12/13 11:55:44 petere Exp $
  *
  * NOTES
  *
@@ -1712,15 +1712,15 @@ processCancelRequest(Port *port, void *pkt)
 			else
 				/* Right PID, wrong key: no way, Jose */
 				ereport(LOG,
-						(errmsg("bad key in cancel request for process %d",
+						(errmsg("wrong key in cancel request for process %d",
 								backendPID)));
 			return;
 		}
 	}
 
 	/* No matching backend */
 	ereport(LOG,
-			(errmsg("bad pid in cancel request for process %d",
+			(errmsg("PID %d in cancel request did not match any process",
 					backendPID)));
 }
 
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.141 2007/11/15 21:14:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.142 2007/12/13 11:55:44 petere Exp $
  *
  * NOTES:
  *
@@ -1003,7 +1003,7 @@ FileClose(File file)
 			{
 				if (filestats.st_size >= log_temp_files)
 					ereport(LOG,
-							(errmsg("temp file: path \"%s\" size %lu",
+							(errmsg("temporary file: path \"%s\", size %lu",
 									vfdP->fileName,
 									(unsigned long) filestats.st_size)));
 			}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.548 2007/11/15 22:25:16 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.549 2007/12/13 11:55:44 petere Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -1712,15 +1712,15 @@ processCancelRequest(Port port, void pkt)`
`1712`	`1712`	`else`
`1713`	`1713`	`/* Right PID, wrong key: no way, Jose */`
`1714`	`1714`	`ereport(LOG,`
`1715`		`- (errmsg("bad key in cancel request for process %d",`
	`1715`	`+ (errmsg("wrong key in cancel request for process %d",`
`1716`	`1716`	`backendPID)));`
`1717`	`1717`	`return;`
`1718`	`1718`	`}`
`1719`	`1719`	`}`
`1720`	`1720`
`1721`	`1721`	`/* No matching backend */`
`1722`	`1722`	`ereport(LOG,`
`1723`		`- (errmsg("bad pid in cancel request for process %d",`
	`1723`	`+ (errmsg("PID %d in cancel request did not match any process",`
`1724`	`1724`	`backendPID)));`
`1725`	`1725`	`}`
`1726`	`1726`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.141 2007/11/15 21:14:38 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.142 2007/12/13 11:55:44 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES:`
`13`	`13`	`*`
`@@ -1003,7 +1003,7 @@ FileClose(File file)`
`1003`	`1003`	`{`
`1004`	`1004`	`if (filestats.st_size >= log_temp_files)`
`1005`	`1005`	`ereport(LOG,`
`1006`		`- (errmsg("temp file: path \"%s\" size %lu",`
	`1006`	`+ (errmsg("temporary file: path \"%s\", size %lu",`
`1007`	`1007`	`vfdP->fileName,`
`1008`	`1008`	`(unsigned long) filestats.st_size)));`
`1009`	`1009`	`}`