You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/11/02 23:14:44 UTC
svn commit: r709957 - in /labs/vysper/src/main: config/
java/org/apache/vysper/mina/ java/org/apache/vysper/mina/codec/
java/org/apache/vysper/xmpp/protocol/ java/org/apache/vysper/xmpp/server/
Author: berndf
Date: Sun Nov 2 14:14:44 2008
New Revision: 709957
URL: http://svn.apache.org/viewvc?rev=709957&view=rev
Log:
[vysper] convert latest System.out into logging calls
Modified:
labs/vysper/src/main/config/log4j.xml
labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
labs/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/SessionStateHolder.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
Modified: labs/vysper/src/main/config/log4j.xml
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/config/log4j.xml?rev=709957&r1=709956&r2=709957&view=diff
==============================================================================
--- labs/vysper/src/main/config/log4j.xml (original)
+++ labs/vysper/src/main/config/log4j.xml Sun Nov 2 14:14:44 2008
@@ -71,7 +71,7 @@
<appender-ref ref="STANZA" />
</category>
- <root>
+ <root >
<appender-ref ref="CONS"/>
<appender-ref ref="FILE"/>
</root>
Modified: labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java?rev=709957&r1=709956&r2=709957&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java Sun Nov 2 14:14:44 2008
@@ -25,6 +25,8 @@
import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.xmlfragment.XMLText;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -34,6 +36,8 @@
public static final String ATTRIBUTE_VYSPER_SESSION = "vysperSession";
public static final String ATTRIBUTE_VYSPER_SESSIONSTATEHOLDER = "vysperSessionStateHolder";
+ final Logger logger = LoggerFactory.getLogger(XmppIoHandlerAdapter.class);
+
private ServerRuntimeContext serverRuntimeContext;
public void setServerRuntimeContext(ServerRuntimeContext serverRuntimeContext) {
@@ -90,23 +94,24 @@
}
public void sessionOpened(IoSession ioSession) throws Exception {
- // TODO implement
- System.err.println("*** session opened");
+ logger.info("new session from {} has been opened", ioSession.getRemoteAddress());
}
public void sessionClosed(IoSession ioSession) throws Exception {
SessionContext sessionContext = extractSession(ioSession);
- if(sessionContext != null) sessionContext.endSession();
- System.err.println("*** session closed");
+ String sessionId = "UNKNOWN";
+ if(sessionContext != null) {
+ sessionId = sessionContext.getSessionId();
+ sessionContext.endSession();
+ }
+ logger.info("session {} has been closed", sessionId);
}
public void sessionIdle(IoSession ioSession, IdleStatus idleStatus) throws Exception {
- // TODO implement
- System.err.println("*** session idle");
+ logger.debug("session {} is idle", ((SessionContext) ioSession.getAttribute(ATTRIBUTE_VYSPER_SESSION)).getSessionId());
}
public void exceptionCaught(IoSession ioSession, Throwable throwable) throws Exception {
- // TODO implement
- throwable.printStackTrace(System.err);
+ logger.warn("error caught on transportation layer: {}", throwable);
}
}
Modified: labs/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java?rev=709957&r1=709956&r2=709957&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java Sun Nov 2 14:14:44 2008
@@ -35,6 +35,7 @@
*/
public class StanzaWriterProtocolEncoder implements ProtocolEncoder {
+ final Logger logger = LoggerFactory.getLogger(StanzaWriterProtocolEncoder.class);
final Logger serverStanzaLogger = LoggerFactory.getLogger("stanza.server");
public void encode(IoSession ioSession, Object o, ProtocolEncoderOutput protocolEncoderOutput) throws Exception {
@@ -59,7 +60,7 @@
}
public void dispose(IoSession ioSession) throws Exception {
- System.err.println("unhandled StanzaWriterProtocolEncoder.dispose()");
+ logger.warn("unhandled StanzaWriterProtocolEncoder.dispose()");
}
public CharsetEncoder getSessionEncoder() {
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java?rev=709957&r1=709956&r2=709957&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java Sun Nov 2 14:14:44 2008
@@ -32,6 +32,11 @@
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.writer.SystemOutStanzaWriter;
+import org.apache.vysper.xmpp.writer.DenseStanzaLogRenderer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
@@ -46,6 +51,8 @@
*/
public class ProtocolWorker implements StanzaProcessor {
+ final Logger logger = LoggerFactory.getLogger(ProtocolWorker.class);
+
private final Map<SessionState, StateAwareProtocolWorker> stateWorker = new HashMap<SessionState, StateAwareProtocolWorker>();
private final ResponseWriter responseWriter = new ResponseWriter();
@@ -152,7 +159,7 @@
stanza, stanzaHandler
);
} catch (Exception e) {
- System.err.println("error executing handler " + stanzaHandler.getClass().getName());
+ logger.error("error executing handler {}Êwith stanza {}", stanzaHandler.getClass().getName(), DenseStanzaLogRenderer.render(stanza));
e.printStackTrace();
}
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/SessionStateHolder.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/SessionStateHolder.java?rev=709957&r1=709956&r2=709957&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/SessionStateHolder.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/SessionStateHolder.java Sun Nov 2 14:14:44 2008
@@ -19,11 +19,16 @@
import org.apache.vysper.xmpp.server.SessionState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* stores the session state
*/
public class SessionStateHolder implements SessionStateModifier {
+ final Logger logger = LoggerFactory.getLogger(SessionStateHolder.class);
+
SessionState currentState = SessionState.UNCONNECTED;
public SessionState getState() {
@@ -32,6 +37,6 @@
public void setState(SessionState newState) {
currentState = newState;
- System.err.println("session state changed to = " + newState);
+ logger.debug("session state changed to = {}", newState);
}
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java?rev=709957&r1=709956&r2=709957&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java Sun Nov 2 14:14:44 2008
@@ -50,6 +50,11 @@
this.sessionStateHolder = sessionStateHolder;
}
+ @Override
+ public String toString() {
+ return sessionId;
+ }
+
public ServerRuntimeContext getServerRuntimeContext() {
return serverRuntimeContext;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org