Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
On Wed, Apr 15, 2015 at 4:55 PM, Heikki Linnakangas wrote: On 04/15/2015 06:41 AM, Fujii Masao wrote: Another question is; should we output the progress report to stderr rather than stdout? I thought this because I found that pg_basebackup reports the progress to stderr. Yeah, probably. We should go through all the output and figure out where each kind of message needs to do. Should follow the principle Alvaro laid out (http://www.postgresql.org/message-id/20150407205320.gn4...@alvh.no-ip.org), and also make sure it's consistent with pg_basebackup and other tools. Michael's patch changed some of the logging but we should take a more holistic look at the situation. And add a comment somewhere explaining the principle. Isn't what we are looking for here a common set of frontend-only APIs, let's say as src/common/logging.c? All the tools we have could use it without knowing if they output on stdout and stderr. -- Michael -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
On 04/15/2015 06:41 AM, Fujii Masao wrote: On Tue, Apr 14, 2015 at 2:17 AM, Alvaro Herrera alvhe...@2ndquadrant.com wrote: Michael Paquier wrote: On Sun, Apr 12, 2015 at 10:17 AM, Alvaro Herrera wrote: What pg_basebackup's progress_report() does is have the message in the translatable part not include the \r; the \r is in a separate fprintf() call. Like the attached then. Not a fan of this approach, because now this function knows that pg_log(PG_PROGRESS) is equivalent to printf(). This abstraction is a bit leaky, isn't it ... Probably not worth sweating about, though. diff --git a/src/bin/pg_rewind/logging.c b/src/bin/pg_rewind/logging.c index aba12d8..3e2dc76 100644 --- a/src/bin/pg_rewind/logging.c +++ b/src/bin/pg_rewind/logging.c @@ -134,7 +134,8 @@ progress_report(bool force) snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT, fetch_size / 1024); - pg_log(PG_PROGRESS, %*s/%s kB (%d%%) copied\r, + pg_log(PG_PROGRESS, %*s/%s kB (%d%%) copied, (int) strlen(fetch_size_str), fetch_done_str, fetch_size_str, percent); + printf(\r); } So could you elaborate your favorite approach? Now pg_log() calls printf() and fflush(stdout). So '\r' is printed after fflush. It's a bit strange. Maybe we can just replace pg_log() with printf() here. A better solution from a modularity point of view would be to add a new function, pg_progress() for this. It would print the line with pg_log() and then print the \r to the end. Then the caller wouldn't need to know whether the progress messages are going to stdout, stderr, or somewhere else entirely. Another question is; should we output the progress report to stderr rather than stdout? I thought this because I found that pg_basebackup reports the progress to stderr. Yeah, probably. We should go through all the output and figure out where each kind of message needs to do. Should follow the principle Alvaro laid out (http://www.postgresql.org/message-id/20150407205320.gn4...@alvh.no-ip.org), and also make sure it's consistent with pg_basebackup and other tools. Michael's patch changed some of the logging but we should take a more holistic look at the situation. And add a comment somewhere explaining the principle. - Heikki -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
On Tue, Apr 14, 2015 at 2:17 AM, Alvaro Herrera alvhe...@2ndquadrant.com wrote: Michael Paquier wrote: On Sun, Apr 12, 2015 at 10:17 AM, Alvaro Herrera wrote: What pg_basebackup's progress_report() does is have the message in the translatable part not include the \r; the \r is in a separate fprintf() call. Like the attached then. Not a fan of this approach, because now this function knows that pg_log(PG_PROGRESS) is equivalent to printf(). This abstraction is a bit leaky, isn't it ... Probably not worth sweating about, though. diff --git a/src/bin/pg_rewind/logging.c b/src/bin/pg_rewind/logging.c index aba12d8..3e2dc76 100644 --- a/src/bin/pg_rewind/logging.c +++ b/src/bin/pg_rewind/logging.c @@ -134,7 +134,8 @@ progress_report(bool force) snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT, fetch_size / 1024); - pg_log(PG_PROGRESS, %*s/%s kB (%d%%) copied\r, + pg_log(PG_PROGRESS, %*s/%s kB (%d%%) copied, (int) strlen(fetch_size_str), fetch_done_str, fetch_size_str, percent); + printf(\r); } So could you elaborate your favorite approach? Now pg_log() calls printf() and fflush(stdout). So '\r' is printed after fflush. It's a bit strange. Maybe we can just replace pg_log() with printf() here. Another question is; should we output the progress report to stderr rather than stdout? I thought this because I found that pg_basebackup reports the progress to stderr. Regards, -- Fujii Masao -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
Michael Paquier wrote: On Sun, Apr 12, 2015 at 10:17 AM, Alvaro Herrera wrote: What pg_basebackup's progress_report() does is have the message in the translatable part not include the \r; the \r is in a separate fprintf() call. Like the attached then. Not a fan of this approach, because now this function knows that pg_log(PG_PROGRESS) is equivalent to printf(). This abstraction is a bit leaky, isn't it ... Probably not worth sweating about, though. diff --git a/src/bin/pg_rewind/logging.c b/src/bin/pg_rewind/logging.c index aba12d8..3e2dc76 100644 --- a/src/bin/pg_rewind/logging.c +++ b/src/bin/pg_rewind/logging.c @@ -134,7 +134,8 @@ progress_report(bool force) snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT, fetch_size / 1024); - pg_log(PG_PROGRESS, %*s/%s kB (%d%%) copied\r, + pg_log(PG_PROGRESS, %*s/%s kB (%d%%) copied, (int) strlen(fetch_size_str), fetch_done_str, fetch_size_str, percent); + printf(\r); } -- Álvaro Herrerahttp://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training Services -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
On Sun, Apr 12, 2015 at 3:03 PM, Michael Paquier michael.paqu...@gmail.com wrote: On Sun, Apr 12, 2015 at 10:17 AM, Alvaro Herrera wrote: What pg_basebackup's progress_report() does is have the message in the translatable part not include the \r; the \r is in a separate fprintf() call. Like the attached then. Pushed. Thanks a lot! Regards, -- Fujii Masao -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
On Sun, Apr 12, 2015 at 10:17 AM, Alvaro Herrera wrote: What pg_basebackup's progress_report() does is have the message in the translatable part not include the \r; the \r is in a separate fprintf() call. Like the attached then. -- Michael diff --git a/src/bin/pg_rewind/logging.c b/src/bin/pg_rewind/logging.c index aba12d8..3e2dc76 100644 --- a/src/bin/pg_rewind/logging.c +++ b/src/bin/pg_rewind/logging.c @@ -134,7 +134,8 @@ progress_report(bool force) snprintf(fetch_size_str, sizeof(fetch_size_str), INT64_FORMAT, fetch_size / 1024); - pg_log(PG_PROGRESS, %*s/%s kB (%d%%) copied\r, + pg_log(PG_PROGRESS, %*s/%s kB (%d%%) copied, (int) strlen(fetch_size_str), fetch_done_str, fetch_size_str, percent); + printf(\r); } -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
On 4/7/15 10:06 PM, Fujii Masao wrote: Mark the second argument of pg_log as the translatable string in nls.mk. gettext (msgmerge) is unhappy about this because po/pg_rewind.pot:501: warning: internationalized messages should not contain the '\r' escape sequence -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
Peter Eisentraut wrote: On 4/7/15 10:06 PM, Fujii Masao wrote: Mark the second argument of pg_log as the translatable string in nls.mk. gettext (msgmerge) is unhappy about this because po/pg_rewind.pot:501: warning: internationalized messages should not contain the '\r' escape sequence What pg_basebackup's progress_report() does is have the message in the translatable part not include the \r; the \r is in a separate fprintf() call. -- Álvaro Herrerahttp://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training Services -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
[COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
Mark the second argument of pg_log as the translatable string in nls.mk. Branch -- master Details --- http://git.postgresql.org/pg/commitdiff/b216ad7bf1a9308c97d2032d4793010e8c8aa7ec Modified Files -- src/bin/pg_rewind/nls.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
On Wed, Apr 8, 2015 at 11:06 AM, Fujii Masao fu...@postgresql.org wrote: Mark the second argument of pg_log as the translatable string in nls.mk. nls.mk is still missing file_ops.c in GETTEXT_FILES as it contains some calls to pg_fatal. -- Michael -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
Re: [COMMITTERS] pgsql: Mark the second argument of pg_log as the translatable string in
On Wed, Apr 8, 2015 at 1:35 PM, Michael Paquier michael.paqu...@gmail.com wrote: On Wed, Apr 8, 2015 at 11:06 AM, Fujii Masao fu...@postgresql.org wrote: Mark the second argument of pg_log as the translatable string in nls.mk. nls.mk is still missing file_ops.c in GETTEXT_FILES as it contains some calls to pg_fatal. Oh, sorry. I was wrongly thinking that the Heikki's recently changes to nls.mk fixed that Fixed. Thanks! Regards, -- Fujii Masao -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
