You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2018/12/14 21:36:41 UTC
[qpid-dispatch] branch master updated: DISPATCH-1223: don't count
transfers with 'more' set as unsettled
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 0bc1456 DISPATCH-1223: don't count transfers with 'more' set as unsettled
0bc1456 is described below
commit 0bc145658521f578d827f7d30c9658bbc20dd11a
Author: Chuck Rolke <cr...@redhat.com>
AuthorDate: Fri Dec 14 16:36:36 2018 -0500
DISPATCH-1223: don't count transfers with 'more' set as unsettled
---
tools/scraper/amqp_detail.py | 9 +++++++--
tools/scraper/common.py | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/tools/scraper/amqp_detail.py b/tools/scraper/amqp_detail.py
index 136fb6b..909e454 100755
--- a/tools/scraper/amqp_detail.py
+++ b/tools/scraper/amqp_detail.py
@@ -401,10 +401,15 @@ class AllDetails():
"connid:%s, line:%s\n" %
(snd_disposition.data.conn_id, snd_disposition.lineno))
else:
- result = "receive settlement absent"
+ if transfer.data.transfer_more:
+ result = "(pending)"
+ else:
+ result = "receive settlement absent"
else:
# two settlements expected
- if rcv_disposition is not None:
+ if transfer.data.transfer_more:
+ result = "(pending)"
+ elif rcv_disposition is not None:
result = "receiver: " + rtext
if snd_disposition is not None:
result += ", sender: " + stext
diff --git a/tools/scraper/common.py b/tools/scraper/common.py
index 654b8b4..a8ff727 100755
--- a/tools/scraper/common.py
+++ b/tools/scraper/common.py
@@ -141,5 +141,5 @@ class RestartRec():
self.datetime = _datetime
def transfer_is_possibly_unsettled(plf):
- return (plf.data.transfer and
+ return (plf.data.transfer and not plf.data.transfer_more and
not (plf.data.transfer_settled or plf.data.final_disposition is not None))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org