diff options
| author | Alex Rudyy <orudyy@apache.org> | 2013-05-17 15:31:05 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2013-05-17 15:31:05 +0000 |
| commit | db4fadf914d8aba50939190cdad8ff78c2d583c9 (patch) | |
| tree | da447e371e3110d2b80de63c3967137b4cfa3a1f /qpid/java | |
| parent | 287b7a8201d2fd4918f2529023ce096c8c949ce7 (diff) | |
| download | qpid-python-db4fadf914d8aba50939190cdad8ff78c2d583c9.tar.gz | |
QPID-4860: Show virtual host state in UI and transition virtual host into ERRORED state on failing to activate
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1483865 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 17 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js index fbd42d8d16..f721ad6fa5 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js @@ -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%"} diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java index 2fa7899572..de626a7639 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java @@ -994,7 +994,22 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual { 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) |