You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2009/08/03 12:10:15 UTC
svn commit: r800279 - in /mina/sandbox/vysper/trunk/server/core/src:
main/java/org/apache/vysper/mina/ main/java/org/apache/vysper/mina/codec/
test/resources/
Author: ngn
Date: Mon Aug 3 10:10:14 2009
New Revision: 800279
URL: http://svn.apache.org/viewvc?rev=800279&view=rev
Log:
Moving stanza logging to a filter
Improved XML stanza logging (VYSPER-99)
Added:
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java
Modified:
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
mina/sandbox/vysper/trunk/server/core/src/test/resources/log4j.properties
Added: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java?rev=800279&view=auto
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java (added)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java Mon Aug 3 10:10:14 2009
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.vysper.mina;
+
+import org.apache.mina.common.IoFilterAdapter;
+import org.apache.mina.common.IoSession;
+import org.apache.vysper.mina.codec.StanzaWriteInfo;
+import org.apache.vysper.xmpp.writer.DenseStanzaLogRenderer;
+import org.apache.vysper.xmpp.xmlfragment.Renderer;
+import org.apache.vysper.xmpp.xmlfragment.XMLElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ */
+public class StanzaLoggingFilter extends IoFilterAdapter {
+
+ final Logger serverLogger = LoggerFactory.getLogger("stanza.server");
+
+ final Logger clientLogger = LoggerFactory.getLogger("stanza.client");
+
+ public void messageReceived(NextFilter nextFilter, IoSession session,
+ Object message) throws Exception {
+ if (message instanceof XMLElement) {
+ XMLElement element = (XMLElement) message;
+
+ if (clientLogger.isInfoEnabled()) {
+ clientLogger.info(DenseStanzaLogRenderer.render(element));
+ }
+ if (clientLogger.isDebugEnabled()) {
+ boolean openElement = true;
+ boolean closeElement = true;
+ // this is somewhat of a hack, can we detect opening and closing elements only cleaner?
+ if (element.getName().equals("stream")) {
+ if (element.getAttributes().size() > 0) {
+ // is stream element, and with attributes, should be opening tag
+ closeElement = false;
+ } else {
+ // is stream element, without attributes, should be closing tag
+ openElement = false;
+ }
+ }
+
+ String xml = toXml(element, openElement, closeElement);
+ clientLogger.debug("Received stanza: " + xml);
+ }
+
+ }
+
+ nextFilter.messageReceived(session, message);
+ }
+
+ public void messageSent(NextFilter nextFilter, IoSession session,
+ Object message) throws Exception {
+ if (message instanceof StanzaWriteInfo) {
+ StanzaWriteInfo stanzaWriteInfo = (StanzaWriteInfo) message;
+
+ if (serverLogger.isInfoEnabled()) {
+ serverLogger.info(DenseStanzaLogRenderer.render(stanzaWriteInfo
+ .getStanza()));
+ }
+ if (serverLogger.isDebugEnabled()) {
+ String xml = toXml(stanzaWriteInfo.getStanza(), stanzaWriteInfo
+ .isWriteOpeningElement(), stanzaWriteInfo
+ .isWriteClosingElement());
+
+ serverLogger.info("Sent stanza: " + xml);
+ }
+ }
+
+ nextFilter.messageSent(session, message);
+ }
+
+ private String toXml(XMLElement element, boolean openElement,
+ boolean closeElement) {
+ Renderer renderer = new Renderer(element);
+
+ StringBuffer xml = new StringBuffer();
+ if (openElement) {
+ xml.append(renderer.getOpeningElement());
+ }
+ xml.append(renderer.getElementContent());
+ if (closeElement) {
+ xml.append(renderer.getClosingElement());
+ }
+ return xml.toString();
+ }
+}
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java?rev=800279&r1=800278&r2=800279&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/TCPEndpoint.java Mon Aug 3 10:10:14 2009
@@ -68,6 +68,7 @@
filterChainBuilder.addLast("executorFilter", new ExecutorFilter());
filterChainBuilder.addLast("xmppCodec", new ProtocolCodecFilter(xmppCodec));
filterChainBuilder.addLast("loggingFilter", new LoggingFilter());
+ filterChainBuilder.addLast("stanzaLoggingFilter", new StanzaLoggingFilter());
SocketAcceptorConfig socketAcceptorConfig = new SocketAcceptorConfig();
socketAcceptorConfig.setFilterChainBuilder(filterChainBuilder);
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java?rev=800279&r1=800278&r2=800279&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/StanzaWriterProtocolEncoder.java Mon Aug 3 10:10:14 2009
@@ -19,20 +19,19 @@
*/
package org.apache.vysper.mina.codec;
+import java.nio.charset.CharsetEncoder;
+
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.vysper.charset.CharsetUtil;
import org.apache.vysper.xmpp.stanza.Stanza;
-import org.apache.vysper.xmpp.writer.DenseStanzaLogRenderer;
import org.apache.vysper.xmpp.writer.StanzaWriter;
import org.apache.vysper.xmpp.xmlfragment.Renderer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.nio.charset.CharsetEncoder;
-
/**
* connects MINA low level protocol and session stanza writer
*
@@ -41,7 +40,6 @@
public class StanzaWriterProtocolEncoder implements ProtocolEncoder {
private final Logger logger = LoggerFactory.getLogger(StanzaWriterProtocolEncoder.class);
- private final Logger serverStanzaLogger = LoggerFactory.getLogger("stanza.server");
public void encode(IoSession ioSession, Object o, ProtocolEncoderOutput protocolEncoderOutput) throws Exception {
if (!(o instanceof StanzaWriteInfo)) {
@@ -52,9 +50,6 @@
Stanza element = stanzaWriteInfo.getStanza();
Renderer renderer = new Renderer(element);
- serverStanzaLogger.info(DenseStanzaLogRenderer.render(element));
- serverStanzaLogger.debug(renderer.getComplete());
-
ByteBuffer byteBuffer = ByteBuffer.allocate(16).setAutoExpand(true);
if (stanzaWriteInfo.isWriteProlog()) byteBuffer.putString(StanzaWriter.XML_PROLOG, getSessionEncoder());
if (stanzaWriteInfo.isWriteOpeningElement()) byteBuffer.putString(renderer.getOpeningElement(), getSessionEncoder());
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java?rev=800279&r1=800278&r2=800279&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java Mon Aug 3 10:10:14 2009
@@ -19,23 +19,20 @@
*/
package org.apache.vysper.mina.codec;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.vysper.charset.CharsetUtil;
-import org.apache.vysper.xmpp.writer.DenseStanzaLogRenderer;
import org.apache.vysper.xmpp.xmldecoder.DecodingException;
import org.apache.vysper.xmpp.xmldecoder.ParticleDecoder;
import org.apache.vysper.xmpp.xmldecoder.XMLParticle;
import org.apache.vysper.xmpp.xmldecoder.XMLRawToFragmentConverter;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* splits xml stream into handy tokens for further processing
@@ -47,8 +44,6 @@
public static final String SESSION_ATTRIBUTE_NAME = "tokenizerParticleList";
private static final XMLRawToFragmentConverter CONVERTER = new XMLRawToFragmentConverter();
- final Logger clientStanzaLogger = LoggerFactory.getLogger("stanza.client");
-
@Override
public boolean doDecode(IoSession ioSession, ByteBuffer byteBuffer, ProtocolDecoderOutput protocolDecoderOutput) throws Exception {
@@ -78,7 +73,6 @@
// propagate element
XMLElement element = (XMLElement) xmlFragment;
- clientStanzaLogger.info(DenseStanzaLogRenderer.render(element));
protocolDecoderOutput.write(element);
} else {
// TODO handle text elements properly might be only whitespaces/newlines
Modified: mina/sandbox/vysper/trunk/server/core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/resources/log4j.properties?rev=800279&r1=800278&r2=800279&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/resources/log4j.properties (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/resources/log4j.properties Mon Aug 3 10:10:14 2009
@@ -15,10 +15,10 @@
# specific language governing permissions and limitations
# under the License.
-log4j.rootLogger=INFO, C
+log4j.rootLogger=DEBUG, C
-log4j.logger.org.apache.vysper=DEBUG, C
log4j.logger.org.apache.vysper.mina.XmppIoHandlerAdapter=WARN,C
+log4j.logger.org.apache.mina.filter.executor.ExecutorFilter=WARN,C
log4j.appender.C=org.apache.log4j.ConsoleAppender
log4j.appender.C.layout=org.apache.log4j.PatternLayout