Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8FA48200B78 for ; Fri, 2 Sep 2016 18:16:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8E1ED160AAE; Fri, 2 Sep 2016 16:16:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D2BFC160A8C for ; Fri, 2 Sep 2016 18:16:14 +0200 (CEST) Received: (qmail 79576 invoked by uid 500); 2 Sep 2016 16:16:14 -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 79567 invoked by uid 99); 2 Sep 2016 16:16:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2016 16:16:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C77C4E0159; Fri, 2 Sep 2016 16:16:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eallen@apache.org To: commits@qpid.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: qpid-dispatch git commit: DISPATCH-350 Fix rate calculation for links Date: Fri, 2 Sep 2016 16:16:13 +0000 (UTC) archived-at: Fri, 02 Sep 2016 16:16:15 -0000 Repository: qpid-dispatch Updated Branches: refs/heads/master d356593fe -> ddc85fab8 DISPATCH-350 Fix rate calculation for links Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ddc85fab Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ddc85fab Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ddc85fab Branch: refs/heads/master Commit: ddc85fab8ffdc2e78a1ba5f586adafeb1ddb2445 Parents: d356593 Author: Ernest Allen Authored: Fri Sep 2 12:15:52 2016 -0400 Committer: Ernest Allen Committed: Fri Sep 2 12:15:52 2016 -0400 ---------------------------------------------------------------------- console/stand-alone/plugin/js/qdrOverview.js | 13 +++++++------ console/stand-alone/plugin/js/qdrService.js | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ddc85fab/console/stand-alone/plugin/js/qdrOverview.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrOverview.js b/console/stand-alone/plugin/js/qdrOverview.js index 6d50170..a187b9c 100644 --- a/console/stand-alone/plugin/js/qdrOverview.js +++ b/console/stand-alone/plugin/js/qdrOverview.js @@ -520,15 +520,16 @@ var QDR = (function (QDR) { var nodeIds = QDRService.nodeIdList() var linkFields = [] var now = Date.now() - var rate = function (response, result) { + var rate = function (linkName, response, result) { if (!$scope.linkFields) return 0; - var name = QDRService.valFor(response.attributeNames, result, "linkName") var oldname = $scope.linkFields.filter(function (link) { - return link.linkName === name + return link.link === linkName }) - if (oldname.length > 0) { + if (oldname.length === 1) { var elapsed = (now - oldname[0].timestamp) / 1000; + if (elapsed < 0) + return 0 var delivered = QDRService.valFor(response.attributeNames, result, "deliveryCount") - oldname[0].rawDeliveryCount //QDR.log.debug("elapsed " + elapsed + " delivered " + delivered) return elapsed > 0 ? parseFloat(Math.round((delivered/elapsed) * 100) / 100).toFixed(2) : 0; @@ -553,7 +554,7 @@ var QDR = (function (QDR) { var uncounts = function () { var und = QDRService.valFor(response.attributeNames, result, "undeliveredCount") var uns = QDRService.valFor(response.attributeNames, result, "unsettledCount") - return und + uns + return QDRService.pretty(und + uns) } var linkName = function () { var namestr = QDRService.nameFromId(nodeName) @@ -624,7 +625,7 @@ var QDR = (function (QDR) { unsettledCount: QDRService.valFor(response.attributeNames, result, "unsettledCount"), uid: linkName, timestamp: now, - rate: rate(response, result), + rate: QDRService.pretty(rate(linkName, response, result)), nodeId: nodeName, identity: QDRService.valFor(response.attributeNames, result, "identity") }) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ddc85fab/console/stand-alone/plugin/js/qdrService.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js index bcfd1ad..ba0c347 100644 --- a/console/stand-alone/plugin/js/qdrService.js +++ b/console/stand-alone/plugin/js/qdrService.js @@ -848,7 +848,7 @@ var QDR = (function(QDR) { var connection; try { connection = self.rhea.connect({ - connection_details:ws('ws://' + baseAddress, ["binary", "AMQWSB10"]), + connection_details:ws('ws://' + baseAddress, ["binary", "base64", "AMQWSB10"]), reconnect:true, properties: {console_identifier: 'Dispatch console'} }); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org