QPID-2839 Add channel (CHN) Operational Loggin on 0-10

Committed patch from SorinS <ssuciu@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1003985 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 5 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
index 71add9c097..c53f65f302 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
@@ -33,7 +33,9 @@ import org.apache.qpid.server.configuration.ConnectionConfig;
 import org.apache.qpid.server.configuration.SessionConfig;
 import org.apache.qpid.server.configuration.SessionConfigType;
 import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.subjects.ConnectionLogSubject;
+import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.logging.actors.GenericActor;
+import org.apache.qpid.server.logging.messages.ChannelMessages;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.BaseQueue;
@@ -55,6 +57,7 @@ import org.apache.qpid.transport.Range;
 import org.apache.qpid.transport.RangeSet;
 import org.apache.qpid.transport.Session;
 import org.apache.qpid.transport.SessionDelegate;
+import org.apache.qpid.transport.Session.State;
 
 import java.lang.ref.WeakReference;
 import java.security.Principal;
@@ -121,6 +124,16 @@ public class ServerSession extends Session implements PrincipalHolder, SessionCo
         this(connection, delegate, name, expiry, ((ServerConnection)connection).getConfig());
     }
 
+    protected void setState(State state)
+    {
+        super.setState(state);
+
+        if (state == State.OPEN)
+        {
+	        GenericActor.getInstance(this).message(ChannelMessages.CREATE());
+        }
+    }
+
     public ServerSession(Connection connection, SessionDelegate delegate, Binary name, long expiry, ConnectionConfig connConfig)
     {
         super(connection, delegate, name, expiry);
@@ -337,7 +350,8 @@ public class ServerSession extends Session implements PrincipalHolder, SessionCo
         {
             task.doTask(this);
         }
-
+        
+        CurrentActor.get().message(getLogSubject(), ChannelMessages.CLOSE());
     }
 
     @Override
@@ -590,10 +604,12 @@ public class ServerSession extends Session implements PrincipalHolder, SessionCo
     public String toLogString()
     {
        return " [" +
-               MessageFormat.format(CHANNEL_FORMAT, getId().toString(), getClientID(),
+               MessageFormat.format(CHANNEL_FORMAT,
+                                   getConnection().getConnectionId(),
+                                   getClientID(),
                                    ((ProtocolEngine) _connectionConfig).getRemoteAddress().toString(),
-                                   this.getVirtualHost().getName(),
-                                   this.getChannel())
+                                   getVirtualHost().getName(),
+                                   getChannel())
             + "] ";
 
     }