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 2011/01/10 08:23:39 UTC
svn commit: r1057095 - in /mina/vysper/trunk/server/core/src:
main/java/org/apache/vysper/mina/ main/java/org/apache/vysper/storage/
main/java/org/apache/vysper/xmpp/protocol/ test/resources/
Author: ngn
Date: Mon Jan 10 07:23:39 2011
New Revision: 1057095
URL: http://svn.apache.org/viewvc?rev=1057095&view=rev
Log:
Fixed temporary logging implementation
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/storage/OpenStorageProviderRegistry.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
mina/vysper/trunk/server/core/src/test/resources/log4j.properties
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java?rev=1057095&r1=1057094&r2=1057095&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/StanzaLoggingFilter.java Mon Jan 10 07:23:39 2011
@@ -43,10 +43,7 @@ public class StanzaLoggingFilter extends
if (message instanceof XMLElement) {
XMLElement element = (XMLElement) message;
- if (clientLogger.isInfoEnabled()) {
- //clientLogger.info(DenseStanzaLogRenderer.render(element));
- }
-// if (clientLogger.isDebugEnabled()) {
+ if(clientLogger.isDebugEnabled()) {
boolean openElement = true;
boolean closeElement = true;
// this is somewhat of a hack, can we detect opening and closing elements only cleaner?
@@ -59,11 +56,12 @@ public class StanzaLoggingFilter extends
openElement = false;
}
}
-
+
String xml = toXml(element, openElement, closeElement);
- clientLogger.debug("Received stanza: " + xml);
- clientLogger.info("< " + xml);
-// }
+ clientLogger.debug("< " + xml);
+ } else if (clientLogger.isInfoEnabled()) {
+ clientLogger.info(DenseStanzaLogRenderer.render(element));
+ }
}
nextFilter.messageReceived(session, message);
@@ -74,16 +72,14 @@ public class StanzaLoggingFilter extends
if (message instanceof StanzaWriteInfo) {
StanzaWriteInfo stanzaWriteInfo = (StanzaWriteInfo) message;
- if (serverLogger.isInfoEnabled()) {
- //serverLogger.info(DenseStanzaLogRenderer.render(stanzaWriteInfo.getStanza()));
- }
-// if (serverLogger.isDebugEnabled()) {
+ if(serverLogger.isDebugEnabled()) {
String xml = toXml(stanzaWriteInfo.getStanza(), stanzaWriteInfo.isWriteOpeningElement(),
stanzaWriteInfo.isWriteClosingElement());
-
- //serverLogger.info("Sent stanza: " + xml);
- clientLogger.info("> " + xml);
-// }
+
+ serverLogger.info("> " + xml);
+ } else if (serverLogger.isInfoEnabled()) {
+ serverLogger.info(DenseStanzaLogRenderer.render(stanzaWriteInfo.getStanza()));
+ }
}
nextFilter.messageSent(session, request);
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/storage/OpenStorageProviderRegistry.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/storage/OpenStorageProviderRegistry.java?rev=1057095&r1=1057094&r2=1057095&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/storage/OpenStorageProviderRegistry.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/storage/OpenStorageProviderRegistry.java Mon Jan 10 07:23:39 2011
@@ -75,17 +75,17 @@ public class OpenStorageProviderRegistry
try {
storageProviderClass = (Class<StorageProvider>) Class.forName(storageProviderFQClassname);
} catch (ClassCastException e) {
- System.err.println("not a Vysper storage provider class: " + storageProviderFQClassname);
+ logger.info("not a Vysper storage provider class: " + storageProviderFQClassname);
return;
} catch (ClassNotFoundException e) {
- System.err.println("could not load storage provider class " + storageProviderFQClassname);
+ logger.info("could not load storage provider class " + storageProviderFQClassname);
return;
}
try {
StorageProvider storageProvider = storageProviderClass.newInstance();
add(storageProvider);
} catch (Exception e) {
- System.err.println("failed to instantiate storage provider class " + storageProviderFQClassname);
+ logger.info("failed to instantiate storage provider class " + storageProviderFQClassname);
return;
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java?rev=1057095&r1=1057094&r2=1057095&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java Mon Jan 10 07:23:39 2011
@@ -89,7 +89,6 @@ public class ProtocolWorker implements S
throw new RuntimeException("cannot process NULL stanzas");
StanzaHandler stanzaHandler = serverRuntimeContext.getHandler(stanza);
-System.out.println(stanzaHandler);
if (stanzaHandler == null) {
responseWriter.handleUnsupportedStanzaType(sessionContext, stanza);
return;
Modified: mina/vysper/trunk/server/core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/resources/log4j.properties?rev=1057095&r1=1057094&r2=1057095&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/resources/log4j.properties (original)
+++ mina/vysper/trunk/server/core/src/test/resources/log4j.properties Mon Jan 10 07:23:39 2011
@@ -17,6 +17,8 @@
log4j.rootLogger=INFO, C
+log4j.logger.stanza.client=DEBUG,C
+log4j.logger.stanza.server=DEBUG,C
log4j.logger.org.apache.vysper.mina.XmppIoHandlerAdapter=WARN,C
log4j.logger.org.apache.mina.filter.executor.ExecutorFilter=WARN,C