pg_receivewal: Improve verbose mode

petere · petere · commit 514731af5876 · 2017-08-15T20:25:37.000-04:00
Some informational messages showed up even if verbose mode was not
used.  Move them to verbose mode.

Author: Michael Paquier &lt;michael.paquier@gmail.com&gt;
Reviewed-by: Daniel Gustafsson &lt;daniel@yesql.se&gt;
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
@@ -120,7 +120,7 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
 	 * slightly before the end of the WAL that we received on the previous
 	 * timeline, but it's close enough for reporting purposes.
 	 */
-	if (prevtimeline != 0 && prevtimeline != timeline)
+	if (verbose && prevtimeline != 0 && prevtimeline != timeline)
 		fprintf(stderr, _("%s: switched to timeline %u at %X/%X\n"),
 				progname, timeline,
 				(uint32) (prevpos >> 32), (uint32) prevpos);
@@ -130,8 +130,9 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
 
 	if (time_to_abort)
 	{
-		fprintf(stderr, _("%s: received interrupt signal, exiting\n"),
-				progname);
+		if (verbose)
+			fprintf(stderr, _("%s: received interrupt signal, exiting\n"),
+					progname);
 		return true;
 	}
 	return false;
