NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit143b54d

committed

pg_basebackup: Fix progress messages when writing to a file

The progress messages print out \r to keep overwriting the same line onthe screen. But this does not yield useful results when writing theoutput to a file. So in that case, print out \n instead.Author: Martín Marqués <martin@2ndquadrant.com>Reviewed-by: Arthur Zakirov <a.zakirov@postgrespro.ru>

1 parent06ae669 commit143b54dCopy full SHA for 143b54d

File tree

1 file changed

+13

-3

lines changed

src/bin/pg_basebackup
- pg_basebackup.c

1 file changed

+13

-3

lines changed

`‎src/bin/pg_basebackup/pg_basebackup.c`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -811,7 +811,10 @@ progress_report(int tablespacenum, const char *filename, bool force)`
`811`	`811`	`totaldone_str,totalsize_str,percent,`
`812`	`812`	`tablespacenum,tablespacecount);`
`813`	`813`
`814`		`-fprintf(stderr,"\r");`
	`814`	`+if (isatty(fileno(stderr)))`
	`815`	`+fprintf(stderr,"\r");`
	`816`	`+else`
	`817`	`+fprintf(stderr,"\n");`
`815`	`818`	`}`
`816`	`819`
`817`	`820`	`staticint32`
`@@ -1796,7 +1799,13 @@ BaseBackup(void)`
`1796`	`1799`	`progname);`
`1797`	`1800`
`1798`	`1801`	`if (showprogress&& !verbose)`
`1799`		`-fprintf(stderr,"waiting for checkpoint\r");`
	`1802`	`+{`
	`1803`	`+fprintf(stderr,"waiting for checkpoint");`
	`1804`	`+if (isatty(fileno(stderr)))`
	`1805`	`+fprintf(stderr,"\r");`
	`1806`	`+else`
	`1807`	`+fprintf(stderr,"\n");`
	`1808`	`+}`
`1800`	`1809`
`1801`	`1810`	`basebkp=`
`1802`	`1811`	`psprintf("BASE_BACKUP LABEL '%s' %s %s %s %s %s %s",`
`@@ -1929,7 +1938,8 @@ BaseBackup(void)`
`1929`	`1938`	`if (showprogress)`
`1930`	`1939`	`{`
`1931`	`1940`	`progress_report(PQntuples(res),NULL, true);`
`1932`		`-fprintf(stderr,"\n");/* Need to move to next line */`
	`1941`	`+if (isatty(fileno(stderr)))`
	`1942`	`+fprintf(stderr,"\n");/* Need to move to next line */`
`1933`	`1943`	`}`
`1934`	`1944`
`1935`	`1945`	`PQclear(res);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit143b54d

File tree

1 file changed

1 file changed

`‎src/bin/pg_basebackup/pg_basebackup.c`

0 commit comments