Author: rgodfrey
Date: Fri Jan 29 12:07:31 2016
New Revision: 1727555
URL: http://svn.apache.org/viewvc?rev=1727555&view=rev
Log:
QPID-7032 : Add extra diagnostic information on the transport in use as a
derived attribute on Connection objects
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
Fri Jan 29 12:07:31 2016
@@ -82,6 +82,9 @@ public interface Connection<X extends Co
Transport getTransport();
@DerivedAttribute
+ String getTransportInfo();
+
+ @DerivedAttribute
Protocol getProtocol();
@DerivedAttribute
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
Fri Jan 29 12:07:31 2016
@@ -107,7 +107,6 @@ public abstract class AbstractAMQPConnec
private boolean _messageAuthorizationRequired;
-
public AbstractAMQPConnection(Broker<?> broker,
ServerNetworkConnection network,
AmqpPort<?> port,
@@ -185,17 +184,25 @@ public abstract class AbstractAMQPConnec
return _network;
}
+ @Override
public final AmqpPort<?> getPort()
{
return _port;
}
+ @Override
public final Transport getTransport()
{
return _transport;
}
@Override
+ public String getTransportInfo()
+ {
+ return _network.getTransportInfo();
+ }
+
+ @Override
public Protocol getProtocol()
{
return _protocol;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
Fri Jan 29 12:07:31 2016
@@ -212,6 +212,12 @@ public class NonBlockingConnection imple
}
}
+ @Override
+ public String getTransportInfo()
+ {
+ return _delegate.getTransportInfo();
+ }
+
boolean wantsRead()
{
return _fullyWritten;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java
Fri Jan 29 12:07:31 2016
@@ -46,4 +46,6 @@ interface NonBlockingConnectionDelegate
void shutdownInput();
void shutdownOutput();
+
+ String getTransportInfo();
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java
Fri Jan 29 12:07:31 2016
@@ -152,4 +152,10 @@ public class NonBlockingConnectionPlainD
{
}
+
+ @Override
+ public String getTransportInfo()
+ {
+ return "";
+ }
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
Fri Jan 29 12:07:31 2016
@@ -30,6 +30,8 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+
import java.io.IOException;
import java.security.Principal;
import java.security.cert.Certificate;
@@ -372,4 +374,10 @@ public class NonBlockingConnectionTLSDel
}
+ @Override
+ public String getTransportInfo()
+ {
+ SSLSession session = _sslEngine.getSession();
+ return session.getProtocol() + " ; " + session.getCipherSuite() ;
+ }
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java
Fri Jan 29 12:07:31 2016
@@ -137,4 +137,10 @@ public class NonBlockingConnectionUndeci
public void shutdownOutput()
{
}
+
+ @Override
+ public String getTransportInfo()
+ {
+ return "";
+ }
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java
Fri Jan 29 12:07:31 2016
@@ -24,4 +24,6 @@ import org.apache.qpid.transport.network
public interface ServerNetworkConnection extends NetworkConnection
{
void reserveOutboundMessageSpace(long size);
+
+ String getTransportInfo();
}
Modified:
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java?rev=1727555&r1=1727554&r2=1727555&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
(original)
+++
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
Fri Jan 29 12:07:31 2016
@@ -449,6 +449,12 @@ class WebSocketProvider implements Accep
}
}
+ @Override
+ public String getTransportInfo()
+ {
+ return _connection.getProtocol();
+ }
+
void setPeerCertificate(final Certificate certificate)
{
_certificate = certificate;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
