diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-05-20 11:23:18 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-05-20 11:23:18 +0000 |
| commit | 5b86d0309be9b714807184ef3f94930019f6cda7 (patch) | |
| tree | e97751f0acb1fc1ba99851823f8cd5e8e6ff0886 | |
| parent | 2d13612bc3d2d207b0d3afc0559d5d934a230f9b (diff) | |
| download | qpid-python-5b86d0309be9b714807184ef3f94930019f6cda7.tar.gz | |
QPID-4860: Show virtual host state in UI and transition virtual host into ERRORED state on failing to activate
merged from trunk r1483865
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1484432 13f79535-47bb-0310-9956-ffa450edef68
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 71ec3c4008..a65d0f40da 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 @@ -995,7 +995,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) |