summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-07-19 11:23:15 +0000
committerRobert Gemmell <robbie@apache.org>2012-07-19 11:23:15 +0000
commitb8e034a771994585028421e9c2781d7ad581c95a (patch)
tree4c871b3d7993346fd3d26f9ed10525019dc5a7c3 /java
parent6938dcff0d383c26e654ae60c5860fa2bd830fa4 (diff)
downloadqpid-python-b8e034a771994585028421e9c2781d7ad581c95a.tar.gz
QPID-4150: Display the name of queue type key(sortKey,priorities,lvqKey) and its value
Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1363297 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js27
-rw-r--r--java/broker-plugins/management-http/src/main/java/resources/showQueue.html2
2 files changed, 27 insertions, 2 deletions
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
index 745ce07012..3ac8b0057d 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
+++ b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
@@ -232,6 +232,18 @@ define(["dojo/_base/xhr",
updater.remove( this.queueUpdater );
};
+ var queueTypeKeys = {
+ priority: "priorities",
+ lvq: "lvqKey",
+ sorted: "sortKey"
+ };
+
+ var queueTypeKeyNames = {
+ priority: "Number of priorities",
+ lvq: "LVQ key",
+ sorted: "Sort key"
+ };
+
function QueueUpdater(containerNode, queueObj, controller)
{
var that = this;
@@ -252,6 +264,8 @@ define(["dojo/_base/xhr",
"durable",
"lifetimePolicy",
"type",
+ "keyName",
+ "keyValue",
"alertRepeatGap",
"alertRepeatGapUnits",
"alertThresholdMessageAge",
@@ -325,8 +339,17 @@ define(["dojo/_base/xhr",
this.unacknowledgedMessages.innerHTML = this.queueData["unacknowledgedMessages"];
bytesDepth = formatter.formatBytes( this.queueData["unacknowledgedBytes"] );
this.unacknowledgedBytes.innerHTML = "(" + bytesDepth.value;
- this.unacknowledgedBytesUnits.innerHTML = bytesDepth.units + ")"
-
+ this.unacknowledgedBytesUnits.innerHTML = bytesDepth.units + ")";
+ if (this.queueData.type == "standard")
+ {
+ this.keyName.style.display = "none";
+ this.keyValue.style.display = "none";
+ }
+ else
+ {
+ this.keyName.innerHTML = queueTypeKeyNames[this.queueData.type] + ":";
+ this.keyValue.innerHTML = this.queueData[queueTypeKeys[this.queueData.type]];
+ }
};
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showQueue.html b/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
index da607dea2f..3be53a45a2 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
+++ b/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
@@ -48,6 +48,8 @@
<span class="bytesOutRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
<br/>
<span style="">Type:</span><span style="position:absolute; left:6em" class="type"></span>
+ <span style="position:absolute; left:26em" class="keyName"></span>
+ <span style="position:absolute; right:1em" class="keyValue"></span>
<br/>
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'">