From 90bf5674a9f421add2aa8f9d22512951de4f803c Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Sun, 12 Jan 2014 18:52:51 +0000 Subject: QPID-5472: [Java Broker] Exceptions used to report bind port failure (AMQP/HTTP) now includes port id/name/number too git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1557591 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/model/adapter/AmqpPortAdapter.java | 9 --------- .../java/org/apache/qpid/server/model/adapter/PortAdapter.java | 7 +++++++ .../org/apache/qpid/server/transport/TCPandSSLTransport.java | 6 ++++++ .../org/apache/qpid/server/management/plugin/HttpManagement.java | 4 ++-- .../org/apache/qpid/transport/network/io/IoNetworkTransport.java | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java index 806e1f600a..5aab3db81a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java @@ -19,9 +19,6 @@ */ package org.apache.qpid.server.model.adapter; -import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS; - -import java.net.InetSocketAddress; import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.Collection; @@ -41,7 +38,6 @@ import org.apache.qpid.server.logging.actors.CurrentActor; import org.apache.qpid.server.logging.messages.BrokerMessages; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.KeyStore; -import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; import org.apache.qpid.server.model.Transport; import org.apache.qpid.server.model.TrustStore; @@ -204,9 +200,4 @@ public class AmqpPortAdapter extends PortAdapter } return null; } - - public String toString() - { - return getName(); - } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java index 0547f961d0..3e7d03b5ac 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java @@ -556,4 +556,11 @@ public class PortAdapter extends AbstractAdapter implements Port return trustStores; } + + @Override + public String toString() + { + return getClass().getSimpleName() + " [id=" + getId() + ", name=" + getName() + ", port=" + getPort() + "]"; + } + } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java index 9aef42e6d0..a26f892483 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java @@ -136,5 +136,11 @@ class TCPandSSLTransport implements AcceptingTransport { return _bindingSocketAddress; } + + @Override + public String toString() + { + return _port.toString(); + } } } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 982b3d9825..c5eea97061 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -182,7 +182,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem } catch (Exception e) { - throw new RuntimeException("Failed to start http management on ports " + httpPorts); + throw new RuntimeException("Failed to start HTTP management on ports : " + httpPorts, e); } CurrentActor.get().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME)); @@ -199,7 +199,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem } catch (Exception e) { - throw new RuntimeException("Failed to stop http management on port " + getHttpPorts(getBroker().getPorts())); + throw new RuntimeException("Failed to stop HTTP management on ports : " + getHttpPorts(getBroker().getPorts())); } } diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java index b584769de0..4ccb88bbf8 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java @@ -146,7 +146,7 @@ public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNet } catch (IOException e) { - throw new TransportException("Unable to start server socket", e); + throw new TransportException("Failed to start AMQP on port : " + config, e); } } -- cgit v1.2.1