svn commit: r567491 - in /mina/trunk/example/src/main/java/org/apache/mina/example/chat: ChatProtocolHandler.java Main.java

[maarten]

Author: maarten
Date: Sun Aug 19 15:19:19 2007
New Revision: 567491

URL: http://svn.apache.org/viewvc?rev=567491&view=rev
Log:
use MdcLoggingFilter in chat example

Modified:
    
mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
    mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java

Modified: 
mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java?rev=567491&r1=567490&r2=567491&view=diff
==============================================================================
--- 
mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
 (original)
+++ 
mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
 Sun Aug 19 15:19:19 2007
@@ -21,13 +21,16 @@
 
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
+import java.util.Map;
 
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoHandlerAdapter;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoSessionLogger;
+import org.apache.mina.filter.logging.MdcLoggingFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * [EMAIL PROTECTED] IoHandler} implementation of a simple chat server 
protocol.
@@ -51,6 +54,8 @@
 
     @Override
     public void messageReceived(IoSession session, Object message) {
+        Logger log = LoggerFactory.getLogger(ChatProtocolHandler.class);
+        log.info("received: " + message);
         String theMessage = (String) message;
         String[] result = theMessage.split(" ", 2);
         String theCommand = result[0];
@@ -90,6 +95,8 @@
 
                 sessions.add(session);
                 session.setAttribute("user", user);
+                Map<String,String> context = (Map<String,String>) 
session.getAttribute(MdcLoggingFilter.CONTEXT_KEY);
+                context.put("user", user);
 
                 // Allow all users
                 users.add(user);
@@ -115,11 +122,9 @@
 
     public void broadcast(String message) {
         synchronized (sessions) {
-            Iterator iter = sessions.iterator();
-            while (iter.hasNext()) {
-                IoSession s = (IoSession) iter.next();
-                if (s.isConnected()) {
-                    s.write("BROADCAST OK " + message);
+            for (IoSession session : sessions) {
+                if (session.isConnected()) {
+                    session.write("BROADCAST OK " + message);
                 }
             }
         }
@@ -143,11 +148,9 @@
 
     public void kick(String name) {
         synchronized (sessions) {
-            Iterator iter = sessions.iterator();
-            while (iter.hasNext()) {
-                IoSession s = (IoSession) iter.next();
-                if (name.equals(s.getAttribute("user"))) {
-                    s.close();
+            for (IoSession session : sessions) {
+                if (name.equals(session.getAttribute("user"))) {
+                    session.close();
                     break;
                 }
             }

Modified: 
mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java?rev=567491&r1=567490&r2=567491&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java 
(original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java Sun 
Aug 19 15:19:19 2007
@@ -26,6 +26,7 @@
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
 import org.apache.mina.filter.logging.LoggingFilter;
+import org.apache.mina.filter.logging.MdcLoggingFilter;
 import org.apache.mina.filter.ssl.SSLFilter;
 import org.apache.mina.transport.socket.nio.SocketAcceptor;
 
@@ -74,7 +75,8 @@
 
     private static void addLogger(DefaultIoFilterChainBuilder chain)
             throws Exception {
-        chain.addLast("logger", new LoggingFilter());
+        chain.addLast("mdc-logger", new MdcLoggingFilter());
+        chain.addLast("logger", new LoggingFilter());        
         System.out.println("Logging ON");
     }
 }