Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1Yhi2D-0001ZQ-2G for pgsql-committers@arkaria.postgresql.org; Mon, 13 Apr 2015 17:20:33 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.80) (envelope-from ) id 1Yhi2B-0002vB-Ii for pgsql-committers@arkaria.postgresql.org; Mon, 13 Apr 2015 17:20:31 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1YhhyY-0006Pz-Jj for pgsql-committers@postgresql.org; Mon, 13 Apr 2015 17:16:46 +0000 Received: from smtprelay0142.b.hostedemail.com ([64.98.42.142] helo=smtprelay.b.hostedemail.com) by magus.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1YhhyO-0001k9-Na; Mon, 13 Apr 2015 17:16:40 +0000 Received: from filter.hostedemail.com (10.5.19.248.rfc1918.com [10.5.19.248]) by smtprelay01.b.hostedemail.com (Postfix) with ESMTP id 9CD012D2A16; Mon, 13 Apr 2015 17:16:35 +0000 (UTC) X-Session-Marker: 616C76686572726540616C76682E6E6F2D69702E6F7267 X-Spam-Summary: 50, 0, 0, , d41d8cd98f00b204, alvherre@alvh.no-ip.org, :::::::, RULES_HIT:41:355:379:599:967:973:988:989:1260:1263:1277:1311:1312:1313:1314:1345:1359:1437:1515:1516:1518:1519:1534:1541:1593:1594:1595:1596:1711:1730:1747:1777:1792:2393:2525:2553:2560:2563:2682:2685:2828:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3352:3865:3866:3867:3870:3871:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4605:4659:5007:6261:8660:9025:9121:10004:10394:10400:10848:11026:11232:11256:11257:11658:11914:12517:12519:12555:13019:13069:13095:13148:13230:13255:13311:13357:13894:13895:21080, 0, RBL:none, CacheIP:none, Bayesian:0.5, 0.5, 0.5, Netcheck:none, DomainCache:0, MSF:not bulk, SPF:fn, MSBL:0, DNSBL:none, Custom_rules:0:0:0 X-HE-Tag: cows50_394bb07bfdc4e X-Filterd-Recvd-Size: 2351 Received: from alvin.alvh.no-ip.org (unknown [186.37.91.19]) (Authenticated sender: alvherre@alvh.no-ip.org) by omf14.b.hostedemail.com (Postfix) with ESMTPA; Mon, 13 Apr 2015 17:16:33 +0000 (UTC) Received: by alvin.alvh.no-ip.org (Postfix, from userid 1000) id B48AF91; Mon, 13 Apr 2015 14:17:05 -0300 (CLST) Date: Mon, 13 Apr 2015 14:17:05 -0300 From: Alvaro Herrera To: Michael Paquier Cc: Peter Eisentraut , Fujii Masao , pgsql-committers@postgresql.org Subject: Re: pgsql: Mark the second argument of pg_log as the translatable string in Message-ID: <20150413171705.GQ4369@alvh.no-ip.org> References: <5529C5A7.3070708@gmx.net> <20150412011715.GK4369@alvh.no-ip.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Pg-Spam-Score: -1.9 (-) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgsql-committers Precedence: bulk Sender: pgsql-committers-owner@postgresql.org 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 Herrera http://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