You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/08/27 04:50:33 UTC
svn commit: r808259 - in
/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc:
IrcComponent.java IrcErrorLogger.java IrcLogger.java IrcProducer.java
Author: ningjiang
Date: Thu Aug 27 02:50:32 2009
New Revision: 808259
URL: http://svn.apache.org/viewvc?rev=808259&view=rev
Log:
CAMEL-1944 Applied patch with thanks to Stan
Added:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java
- copied, changed from r808242, camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcErrorLogger.java
Removed:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcErrorLogger.java
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java?rev=808259&r1=808258&r2=808259&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java Thu Aug 27 02:50:32 2009
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.irc;
-import java.net.URI;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.schwering.irc.lib.IRCConnection;
-
+import org.schwering.irc.lib.IRCEventListener;
import org.schwering.irc.lib.ssl.SSLIRCConnection;
/**
@@ -38,6 +37,7 @@
private static final transient Log LOG = LogFactory.getLog(IrcComponent.class);
private IrcConfiguration configuration;
private final Map<String, IRCConnection> connectionCache = new HashMap<String, IRCConnection>();
+ private IRCEventListener ircLogger;
public IrcComponent() {
configuration = new IrcConfiguration();
@@ -103,6 +103,13 @@
conn.setColors(configuration.isColors());
conn.setPong(true);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Adding IRC event logging listener");
+ }
+
+ ircLogger = createIrcLogger();
+ conn.addIRCEventListener(ircLogger);
+
try {
conn.connect();
} catch (Exception e) {
@@ -131,6 +138,10 @@
super.doStop();
}
+ protected IRCEventListener createIrcLogger() {
+ return new IrcLogger(LOG);
+ }
+
public IrcConfiguration getConfiguration() {
return configuration;
}
Copied: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java (from r808242, camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcErrorLogger.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java?p2=camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java&p1=camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcErrorLogger.java&r1=808242&r2=808259&rev=808259&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcErrorLogger.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java Thu Aug 27 02:50:32 2009
@@ -26,65 +26,101 @@
*
* @version $Revision$
*/
-public class IrcErrorLogger extends IRCEventAdapter {
+public class IrcLogger extends IRCEventAdapter {
private Log log;
- public IrcErrorLogger(Log log) {
+ public IrcLogger(Log log) {
this.log = log;
}
@Override
- public void onRegistered() {
- super.onRegistered();
- log.info("onRegistered");
+ public void onDisconnected() {
+ log.info("onDisconnected");
}
@Override
- public void onDisconnected() {
- super.onDisconnected();
- log.info("onDisconnected");
+ public void onError(int num, String msg) {
+ log.error("onError - num=" + num + " msg=\"" + msg + "\"");
}
@Override
- public void onMode(String string, IRCUser ircUser, IRCModeParser ircModeParser) {
- super.onMode(string, ircUser, ircModeParser);
- log.info("onMode.string = " + string);
- log.info("onMode.ircUser = " + ircUser);
- log.info("onMode.ircModeParser = " + ircModeParser);
+ public void onError(String msg) {
+ log.error("onError - msg=\"" + msg + "\"");
}
@Override
- public void onMode(IRCUser ircUser, String string, String string1) {
- super.onMode(ircUser, string, string1);
- log.info("onMode.ircUser = " + ircUser);
- log.info("onMode.string = " + string);
- log.info("onMode.string1 = " + string1);
+ public void onInvite(String chan, IRCUser user, String passiveNick) {
+ log.debug("onInvite - chan=" + chan + " user=" + user + " passiveNick=" + passiveNick);
}
@Override
- public void onPing(String string) {
- super.onPing(string);
- log.info("onPing.string = " + string);
+ public void onJoin(String chan, IRCUser user) {
+ log.debug("onJoin - chan=" + chan + " user=" + user);
+ }
+
+ @Override
+ public void onKick(String chan, IRCUser user, String passiveNick, String msg) {
+ log.debug("onKick - chan=" + chan + " user=" + user + " passiveNick=" + passiveNick + " msg=\"" + msg + "\"");
+ }
+
+ @Override
+ public void onMode(String chan, IRCUser user, IRCModeParser ircModeParser) {
+ log.info("onMode - chan=" + chan + " user=" + user + " ircModeParser=" + ircModeParser);
+ }
+
+ @Override
+ public void onMode(IRCUser user, String passiveNick, String mode) {
+ log.info("onMode - user=" + user + " passiveNick=" + passiveNick + " mode=" + mode);
+ }
+
+ @Override
+ public void onNick(IRCUser user, String newNick) {
+ log.debug("onNick - user=" + user + " newNick=" + newNick);
+ }
+
+ @Override
+ public void onNotice(String target, IRCUser user, String msg) {
+ log.debug("onNotice - target=" + target + " user=" + user + " msg=\"" + msg + "\"");
+ }
+
+ @Override
+ public void onPart(String chan, IRCUser user, String msg) {
+ log.debug("onPart - chan=" + chan + " user=" + user + " msg=\"" + msg + "\"");
+ }
+
+ @Override
+ public void onPing(String ping) {
+ log.info("onPing - ping=" + ping);
+ }
+
+ @Override
+ public void onPrivmsg(String target, IRCUser user, String msg) {
+ log.debug("onPrivmsg - target=" + target + " user=" + user + " msg=\"" + msg + "\"");
+ }
+
+ @Override
+ public void onQuit(IRCUser user, String msg) {
+ log.debug("onQuit - user=" + user + " msg=\"" + msg + "\"");
+ }
+
+ @Override
+ public void onRegistered() {
+ log.info("onRegistered");
}
@Override
- public void onError(String string) {
- log.info("onError.string = " + string);
+ public void onReply(int num, String value, String msg) {
+ log.debug("onReply - num=" + num + " value=\"" + value + "\" msg=\"" + msg + "\"");
}
@Override
- public void onError(int i, String string) {
- super.onError(i, string);
- log.error("onError.i = " + i);
- log.error("onError.string = " + string);
+ public void onTopic(String chan, IRCUser user, String topic) {
+ log.debug("onTopic - chan=" + chan + " user=" + user + " topic=" + topic);
}
@Override
- public void unknown(String string, String string1, String string2, String string3) {
- super.unknown(string, string1, string2, string3);
- log.error("unknown.string = " + string);
- log.error("unknown.string1 = " + string1);
- log.error("unknown.string2 = " + string2);
- log.error("unknown.string3 = " + string3);
+ public void unknown(String prefix, String command, String middle, String trailing) {
+ log.info("unknown - prefix=" + prefix + " command=" + command + " middle=" + middle + " trailing="
+ + trailing);
}
}
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java?rev=808259&r1=808258&r2=808259&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java Thu Aug 27 02:50:32 2009
@@ -21,7 +21,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.schwering.irc.lib.IRCConnection;
-import org.schwering.irc.lib.IRCEventListener;
public class IrcProducer extends DefaultProducer {
@@ -32,7 +31,6 @@
private IRCConnection connection;
private IrcEndpoint endpoint;
- private IRCEventListener ircErrorLogger;
public IrcProducer(IrcEndpoint endpoint, IRCConnection connection) {
super(endpoint);
@@ -67,9 +65,6 @@
protected void doStart() throws Exception {
super.doStart();
- ircErrorLogger = createIrcErrorLogger();
- connection.addIRCEventListener(ircErrorLogger);
-
for (String channel : endpoint.getConfiguration().getChannels()) {
if (LOG.isDebugEnabled()) {
LOG.debug("Joining: " + channel);
@@ -87,7 +82,6 @@
}
connection.doPart(channel);
}
- connection.removeIRCEventListener(ircErrorLogger);
}
super.doStop();
}
@@ -101,8 +95,4 @@
return false;
}
- protected IRCEventListener createIrcErrorLogger() {
- return new IrcErrorLogger(LOG);
- }
-
}