From commits-return-49901-archive-asf-public=cust-asf.ponee.io@qpid.apache.org Thu Jun 25 19:11:29 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id F0B25180181 for ; Thu, 25 Jun 2020 21:11:28 +0200 (CEST) Received: (qmail 4816 invoked by uid 500); 25 Jun 2020 19:11:28 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 4807 invoked by uid 99); 25 Jun 2020 19:11:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2020 19:11:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9D03D890B8; Thu, 25 Jun 2020 19:11:27 +0000 (UTC) Date: Thu, 25 Jun 2020 19:11:27 +0000 To: "commits@qpid.apache.org" Subject: [qpid-dispatch] branch master updated: DISPATCH-1692: Strip away '(truncated)' from long transfers MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159311228735.10440.4724652078190347537@gitbox.apache.org> From: chug@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: qpid-dispatch X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: df22f36b9d45ccf9c555f847919c911e6c6d57e8 X-Git-Newrev: 2f0c33d930d08e0146ae62b23d60d4a73e1d13f5 X-Git-Rev: 2f0c33d930d08e0146ae62b23d60d4a73e1d13f5 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. chug pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git The following commit(s) were added to refs/heads/master by this push: new 2f0c33d DISPATCH-1692: Strip away '(truncated)' from long transfers 2f0c33d is described below commit 2f0c33d930d08e0146ae62b23d60d4a73e1d13f5 Author: Chuck Rolke AuthorDate: Thu Jun 25 15:07:25 2020 -0400 DISPATCH-1692: Strip away '(truncated)' from long transfers Show only the useful data just before the common line ending. --- tools/scraper/parser.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/scraper/parser.py b/tools/scraper/parser.py index 16e3da5..edf110a 100755 --- a/tools/scraper/parser.py +++ b/tools/scraper/parser.py @@ -753,13 +753,17 @@ class ParsedLogLine(object): # Performative: transfer [channel,handle] (id) self.transfer_short_name = self.shorteners.short_data_names.translate(res.transfer_bare, customer=self) showdat = "%s" % (self.transfer_short_name, self.transfer_short_name) + spl = common.strings_of_proton_log(res.transfer_bare) + to_strip = "\"... (truncated)" + if spl.endswith(to_strip): + spl = spl[:-len(to_strip)] res.web_show_str = "%s %s (%s) %s %s %s %s %s %s - %s bytes" % ( res.name, colorize_bg(res.channel_handle), res.delivery_id, self.highlighted("settled", res.transfer_settled, common.color_of("presettled")), self.highlighted("more", res.transfer_more, common.color_of("more")), self.highlighted("resume", res.transfer_resume, common.color_of("aborted")), self.highlighted("aborted", res.transfer_aborted, common.color_of("aborted")), - showdat, common.strings_of_proton_log(res.transfer_bare)[-SEQUENCE_TRANSFER_SIZE:], + showdat, spl[-SEQUENCE_TRANSFER_SIZE:], res.transfer_size) res.sdorg_str = "%s %s (%s) %s (%s%s%s%s)\\n%s" % ( res.name, res.channel_handle, res.delivery_id, res.transfer_size, @@ -767,7 +771,7 @@ class ParsedLogLine(object): self.unhighlighted(" more", res.transfer_more), self.unhighlighted(" resume", res.transfer_resume), self.unhighlighted(" aborted", res.transfer_aborted), - common.strings_of_proton_log(res.transfer_bare)[-SEQUENCE_TRANSFER_SIZE:]) + spl[-SEQUENCE_TRANSFER_SIZE:]) def adverbl_link_to(self): """ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org