You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/04/27 13:26:08 UTC
svn commit: r1741231 -
/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
Author: lquack
Date: Wed Apr 27 11:26:08 2016
New Revision: 1741231
URL: http://svn.apache.org/viewvc?rev=1741231&view=rev
Log:
QPID-7210: [Java Broker, WMC] Make REST requests to VirtualHost and getConnections in parallel
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
Modified: qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1741231&r1=1741230&r2=1741231&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Wed Apr 27 11:26:08 2016
@@ -19,6 +19,7 @@
*
*/
define(["dojo/parser",
+ "dojo/promise/all",
"dojo/query",
"dojo/_base/connect",
"dijit/registry",
@@ -35,7 +36,7 @@ define(["dojo/parser",
"qpid/management/editVirtualHost",
"dojo/text!showVirtualHost.html",
"dojo/domReady!"],
- function (parser, query, connect, registry, entities, properties, updater, util, formatter, UpdatableStore, addQueue, addExchange, addLogger, EnhancedGrid, editVirtualHost, template) {
+ function (parser, all, query, connect, registry, entities, properties, updater, util, formatter, UpdatableStore, addQueue, addExchange, addLogger, EnhancedGrid, editVirtualHost, template) {
function VirtualHost(name, parent, controller) {
this.name = name;
@@ -368,48 +369,35 @@ define(["dojo/parser",
{
var thisObj = this;
- this.management.load(this.modelObj)
- .then(function(data) {
- thisObj.vhostData = data[0] || {name: thisObj.modelObj.name,statistics:{messagesIn:0,bytesIn:0,messagesOut:0,bytesOut:0}};
- thisObj.management.get({url: thisObj.management.objectToURL(thisObj.modelObj) + "/getConnections" })
- .then(function(data){
- thisObj.vhostData["connections"] = data;
-
- if (callback)
- {
- callback();
- }
-
- try
- {
- thisObj._update();
- }
- catch(e)
- {
- if (console && console.error)
- {
- console.error(e);
- }
- }
-
- },
- function(error)
- {
- util.tabErrorHandler(error, { updater:thisObj,
- contentPane: thisObj.tabObject.contentPane,
- tabContainer: thisObj.tabObject.controller.tabContainer,
- name: thisObj.modelObj.name,
- category: "Virtual Host" });
- });
- },
- function(error)
+ var vhostLoadedPromise = this.management.load(this.modelObj);
+ var connectionsPromise = this.management.get({url: this.management.objectToURL(this.modelObj) + "/getConnections"});
+ all({vhostLoadedPromise: vhostLoadedPromise, connectionsPromise: connectionsPromise}).then(function(results) {
+ thisObj.vhostData = results.vhostLoadedPromise[0] || {name: thisObj.modelObj.name,statistics:{messagesIn:0,bytesIn:0,messagesOut:0,bytesOut:0}};
+ thisObj.vhostData.connections = results.connectionsPromise;
+ if (callback)
+ {
+ callback();
+ }
+ try
{
- util.tabErrorHandler(error, { updater:thisObj,
- contentPane: thisObj.tabObject.contentPane,
- tabContainer: thisObj.tabObject.controller.tabContainer,
- name: thisObj.modelObj.name,
- category: "Virtual Host" });
- });
+ thisObj._update();
+ }
+ catch(e)
+ {
+ if (console && console.error)
+ {
+ console.error(e);
+ }
+ }
+ },
+ function(error)
+ {
+ util.tabErrorHandler(error, { updater:thisObj,
+ contentPane: thisObj.tabObject.contentPane,
+ tabContainer: thisObj.tabObject.controller.tabContainer,
+ name: thisObj.modelObj.name,
+ category: "Virtual Host" });
+ });
};
Updater.prototype._update = function()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org