Author: robbie
Date: Mon May 20 11:23:18 2013
New Revision: 1484432
URL: http://svn.apache.org/r1484432
Log:
QPID-4860: Show virtual host state in UI and transition virtual host into
ERRORED state on failing to activate
merged from trunk r1483865
Modified:
qpid/branches/0.22/qpid/java/ (props changed)
qpid/branches/0.22/qpid/java/broker/ (props changed)
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
Propchange: qpid/branches/0.22/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1483865
Propchange: qpid/branches/0.22/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1483865
Modified:
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1484432&r1=1484431&r2=1484432&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
(original)
+++
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Mon May 20 11:23:18 2013
@@ -537,6 +537,7 @@ define(["dojo/_base/xhr",
that.vhostsGrid =
new UpdatableStore(that.brokerData.vhosts,
query(".broker-virtualhosts")[0],
[ { name: "Virtual Host",
field: "name", width: "120px"},
+ { name: "State", field:
"state", width: "70px"},
{ name: "Connections",
field: "connectionCount", width: "80px"},
{ name: "Queues",
field: "queueCount", width: "80px"},
{ name: "Exchanges",
field: "exchangeCount", width: "100%"}
Modified:
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java?rev=1484432&r1=1484431&r2=1484432&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
(original)
+++
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
Mon May 20 11:23:18 2013
@@ -995,7 +995,22 @@ public final class VirtualHostAdapter ex
{
if (desiredState == State.ACTIVE)
{
- activate();
+ try
+ {
+ activate();
+ }
+ catch(RuntimeException e)
+ {
+ changeAttribute(STATE, State.INITIALISING, State.ERRORED);
+ if (_broker.isManagementMode())
+ {
+ LOGGER.warn("Failed to activate virtual host: " +
getName(), e);
+ }
+ else
+ {
+ throw e;
+ }
+ }
return true;
}
else if (desiredState == State.STOPPED)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
