Author: kwall
Date: Tue Nov 24 13:01:12 2015
New Revision: 1716126
URL: http://svn.apache.org/viewvc?rev=1716126&view=rev
Log:
QPID-6901: [Java Broker] Fix channel log subject for 0-10 and 1.0 to use
authorized id rather than client id
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java?rev=1716126&r1=1716125&r2=1716126&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
Tue Nov 24 13:01:12 2015
@@ -20,9 +20,6 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.CONNECTION_FORMAT;
-import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.SOCKET_FORMAT;
-import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.USER_FORMAT;
import static org.apache.qpid.transport.Connection.State.CLOSING;
import java.net.SocketAddress;
@@ -30,9 +27,7 @@ import java.security.AccessControlContex
import java.security.AccessController;
import java.security.Principal;
import java.security.PrivilegedAction;
-import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
@@ -285,41 +280,6 @@ public class ServerConnection extends Co
}
}
- public String toLogString()
- {
- boolean hasVirtualHost = (null != this.getVirtualHost());
- boolean hasClientId = (null != getClientId());
-
- if (hasClientId && hasVirtualHost)
- {
- return "[" +
- MessageFormat.format(CONNECTION_FORMAT,
- getConnectionId(),
- getClientId(),
- getRemoteAddressString(),
- getVirtualHost().getName())
- + "] ";
- }
- else if (hasClientId)
- {
- return "[" +
- MessageFormat.format(USER_FORMAT,
- getConnectionId(),
- getClientId(),
- getRemoteAddressString())
- + "] ";
-
- }
- else
- {
- return "[" +
- MessageFormat.format(SOCKET_FORMAT,
- getConnectionId(),
- getRemoteAddressString())
- + "] ";
- }
- }
-
public void sendConnectionCloseAsync(final AMQConstant cause, final String
message)
{
addAsyncTask(new Action<ServerConnection>()
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1716126&r1=1716125&r2=1716126&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
Tue Nov 24 13:01:12 2015
@@ -908,15 +908,16 @@ public class ServerSession extends Sessi
long connectionId = super.getConnection() instanceof ServerConnection
? getConnection().getConnectionId()
: -1;
+ String authorizedPrincipal = (getAuthorizedPrincipal() == null) ? "?"
: getAuthorizedPrincipal().getName();
String remoteAddress =
String.valueOf(getConnection().getRemoteSocketAddress());
return "[" +
MessageFormat.format(CHANNEL_FORMAT,
connectionId,
- getClientID(),
- remoteAddress,
- getVirtualHost().getName(),
- getChannel())
+ authorizedPrincipal,
+ remoteAddress,
+ getVirtualHost().getName(),
+ getChannel())
+ "] ";
}
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1716126&r1=1716125&r2=1716126&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Tue Nov 24 13:01:12 2015
@@ -743,18 +743,18 @@ public class Session_1_0 implements Sess
return getConsumers().size();
}
-
-
+ @Override
public String toLogString()
{
- long connectionId = getAMQPConnection().getConnectionId();
-
- String remoteAddress = getAMQPConnection().getRemoteAddressString();
+ final AMQPConnection<?> amqpConnection = getAMQPConnection();
+ long connectionId = amqpConnection.getConnectionId();
+ String remoteAddress = amqpConnection.getRemoteAddressString();
+ final String authorizedPrincipal =
amqpConnection.getAuthorizedPrincipal() == null ? "?" :
amqpConnection.getAuthorizedPrincipal().getName();
return "[" +
MessageFormat.format(CHANNEL_FORMAT,
connectionId,
- getClientID(),
+ authorizedPrincipal,
remoteAddress,
getVirtualHost().getName(),
_endpoint.getSendingChannel()) + "] ";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
