Add logging to /contrib/pg_standby if -k couldn't clean up the log file.

bmomjian · bmomjian · commit 053981f4054f · 2007-03-03T18:50:45.000Z
Darcy Buskermolen
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -264,10 +264,15 @@ CustomizableCleanupPriorWALFiles(void)
 #else
 					snprintf(WALFilePath, MAXPGPATH, "%s/%s", archiveLocation, xlde->d_name);
 #endif
-					rc = unlink(WALFilePath);
 
 					if (debug)
-					   	fprintf(stderr, "\npg_standby: removed \"%s\"\n", WALFilePath);
+					   	fprintf(stderr, "\npg_standby: removing \"%s\"\n", WALFilePath);
+
+					rc = unlink(WALFilePath);
+					if (rc !=0 )
+						fprintf(stderr, "\npg_standby: ERROR failed to remove \"%s\" because %s\n", WALFilePath,  strerror(errno));
+
+
 				}
 			}
 		}
@@ -315,7 +320,7 @@ CheckForExternalTrigger(void)
 		rc = unlink(triggerPath);
 		if (rc != 0)
 		{
-			fprintf(stderr, "\n ERROR: unable to remove \"%s\", rc=%d", triggerPath, rc);
+			fprintf(stderr, "\n ERROR: unable to remove \"%s\", because %s", triggerPath, strerror(errno));
 			fflush(stderr);
 			exit(rc);
 		}

Original file line number	Diff line number	Diff line change
`@@ -264,10 +264,15 @@ CustomizableCleanupPriorWALFiles(void)`
`264`	`264`	`#else`
`265`	`265`	`snprintf(WALFilePath, MAXPGPATH, "%s/%s", archiveLocation, xlde->d_name);`
`266`	`266`	`#endif`
`267`		`- rc = unlink(WALFilePath);`
`268`	`267`
`269`	`268`	`if (debug)`
`270`		`- fprintf(stderr, "\npg_standby: removed \"%s\"\n", WALFilePath);`
	`269`	`+ fprintf(stderr, "\npg_standby: removing \"%s\"\n", WALFilePath);`
	`270`	`+`
	`271`	`+ rc = unlink(WALFilePath);`
	`272`	`+ if (rc !=0 )`
	`273`	`+ fprintf(stderr, "\npg_standby: ERROR failed to remove \"%s\" because %s\n", WALFilePath, strerror(errno));`
	`274`	`+`
	`275`	`+`
`271`	`276`	`}`
`272`	`277`	`}`
`273`	`278`	`}`
`@@ -315,7 +320,7 @@ CheckForExternalTrigger(void)`
`315`	`320`	`rc = unlink(triggerPath);`
`316`	`321`	`if (rc != 0)`
`317`	`322`	`{`
`318`		`- fprintf(stderr, "\n ERROR: unable to remove \"%s\", rc=%d", triggerPath, rc);`
	`323`	`+ fprintf(stderr, "\n ERROR: unable to remove \"%s\", because %s", triggerPath, strerror(errno));`
`319`	`324`	`fflush(stderr);`
`320`	`325`	`exit(rc);`
`321`	`326`	`}`