ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java (file contents):
Revision 1.12 by tdb, Sun Mar 4 05:37:15 2001 UTC vs.
Revision 1.27 by tdb, Sat Mar 24 18:43:38 2001 UTC

#	Line 1 | Line 1
1		//---PACKAGE DECLARATION---
2	<	package uk.ac.ukc.iscream.client.alerters;
2	>	package uk.org.iscream.client.alerters;
3
4		//---IMPORTS---
5	<	import uk.ac.ukc.iscream.client.*;
6	<	import uk.ac.ukc.iscream.core.*;
7	<	import uk.ac.ukc.iscream.util.*;
8	<	import uk.ac.ukc.iscream.componentmanager.*;
9	<
5	>	import uk.org.iscream.client.*;
6	>	import uk.org.iscream.core.*;
7	>	import uk.org.iscream.util.*;
8	>	import uk.org.iscream.componentmanager.*;
9		import java.io.*;
10		import java.net.*;
11		import java.util.*;
12	<	import java.text.*;
12	>	import java.text.DateFormat;
13
14		/**
15		* This Alert sends an IRC message.
#	Line 21 | Line 20 | import java.text.*;
20		* @author  $Author$
21		* @version $Id$
22		*/
23	<	public class IRC__Alerter implements PluginAlerter {
23	>	public class IRC__Alerter extends AlerterSkeleton {
24
25		//---FINAL ATTRIBUTES---
26
#	Line 45 | Line 44 | public class IRC__Alerter implements PluginAlerter {
44		//---CONSTRUCTORS---
45
46		public IRC__Alerter() {
47	<
47	>	super();
48		// connect to the IRC server
49		_ircbot = new IRCBot();
50	+	// set it's name and start it
51	+	_ircbot.setName("client.IRC__Alerter$IRCBot");
52		_ircbot.start();
53		_startTime = System.currentTimeMillis();
53	–
54		_logger.write(toString(), Logger.SYSINIT, "IRC Alerter started");
55		}
56
57		//---PUBLIC METHODS---
58
59	+	/**
60	+	* Implements the abstract method from the skeleton class.
61	+	* This method will attempt to send an alert
62	+	* message over the IRC channel.
63	+	*
64	+	* @param alert the alert to send
65	+	*/
66		public void sendAlert(Alert alert) {
67	+	// sort out the message
68	+	String alertType = Alert.alertLevels[alert.getLevel()];
69	+	String message;
70	+	try {
71	+	message = _cp.getProperty(_name, "Alerter.IRC.message");
72	+	} catch (PropertyNotFoundException e) {
73	+	message = NOT_CONFIGURED;
74	+	_logger.write(toString(), Logger.WARNING, "Alerter.IRC.message value unavailable using default of " + message);
75	+	}
76	+	message = processAlertMessage(message, alert);
77		// only send alerts if we're active
78	<	if(_active) {
79	<	ConfigurationProxy cp = ConfigurationProxy.getInstance();
80	<	String levelName = cp.getProperty(_name, "Alerter.IRC.level");
81	<	int level = StringUtils.getStringPos(levelName, Alert.alertLevels);
82	<	// only send if it's equal (or above) our level
83	<	if(alert.getLevel() >= level) {
84	<	String alertType = Alert.alertLevels[alert.getLevel()];
85	<	String thresholdType = Alert.thresholdLevels[alert.getThreshold()];
86	<	// sort out the message
70	<	String message = cp.getProperty(_name, "Alerter.IRC.message");
71	<	message = StringUtils.replaceText(message, "%level%", alertType);
72	<	message = StringUtils.replaceText(message, "%threshold%", thresholdType);
73	<	message = StringUtils.replaceText(message, "%source%", alert.getSource());
74	<	message = StringUtils.replaceText(message, "%value%", alert.getValue());
75	<	message = StringUtils.replaceText(message, "%thresholdValue%", alert.getThresholdValue());
76	<	message = StringUtils.replaceText(message, "%attributeName%", alert.getAttributeName());
77	<	message = StringUtils.replaceText(message, "%timeTillNextAlert%",  getTimeString(Long.parseLong(alert.getTimeTillNextAlert())));
78	<
79	<	// send the message
80	<	_logger.write(toString(), Logger.DEBUG, "Sending " + _name + " at "+ alertType + " level");
81	<	_ircbot.sendMsg(message);
82	<	_lastAlert = message;
83	<	_lastAlertTime = System.currentTimeMillis();
84	<	_alertCount ++;
85	<	}
78	>	if(_active) {
79	>	// send the message
80	>	_logger.write(toString(), Logger.DEBUG, "Sending " + _name + " at "+ alertType + " level");
81	>	_ircbot.sendMsg(message);
82	>	// count sent alerts
83	>	_alertCount++;
84	>	} else {
85	>	// don't send, but keep a count that we ignored it
86	>	_ignoredCount++;
87		}
88	+	// we'll always store the "last alert", regardless
89	+	// of whether we actually display it or not
90	+	_lastAlert = message;
91	+	_lastAlertTime = System.currentTimeMillis();
92		}
93
94		/**
95		* Overrides the {@link java.lang.Object#toString() Object.toString()}
96		* method to provide clean logging (every class should have this).
97		*
98	<	* This uses the uk.ac.ukc.iscream.util.NameFormat class
98	>	* This uses the uk.org.iscream.util.NameFormat class
99		* to format the toString()
100		*
101		* @return the name of this class and its CVS revision
#	Line 102 | Line 107 | public class IRC__Alerter implements PluginAlerter {
107		REVISION);
108		}
109
110	<	/**
111	<	* return the String representation of what the filter does
110	>	/**
111	>	* Return the String representation of what the alerter does
112	>	*
113	>	* @return the description
114		*/
115		public String getDescription(){
116		return DESC;
#	Line 111 | Line 118 | public class IRC__Alerter implements PluginAlerter {
118
119		//---PRIVATE METHODS---
120
114	–	private String getTimeString(long time) {
115	–	String timeString = null;
116	–	if (time >= 60) {
117	–	timeString = (time / 60) + " minute(s)";
118	–	} else if (time >= 3600) {
119	–	timeString = ((time/60) / 60) + " hour(s)";
120	–	} else {
121	–	timeString = time + " second(s)";
122	–	}
123	–	return timeString;
124	–	}
125	–
121		//---ACCESSOR/MUTATOR METHODS---
122
123		//---ATTRIBUTES---
#	Line 150 | Line 145 | public class IRC__Alerter implements PluginAlerter {
145		/**
146		* Number of alerts sent
147		*/
148	<	private long _alertCount = 0;
148	>	private int _alertCount = 0;
149
150		/**
151	+	* Number of alerts ignored when in "stopped" mode
152	+	*/
153	+	private int _ignoredCount = 0;
154	+
155	+	/**
156		* Time of IRCBot startup
157		*/
158		private long _startTime;
#	Line 166 | Line 166 | public class IRC__Alerter implements PluginAlerter {
166		* can be placed here.  This name could also
167		* be changed to null for utility classes.
168		*/
169	<	private String _name = "IRC Alert";
169	>	private String _name = "IRC";
170
171	–	/**
172	–	* This holds a reference to the
173	–	* system logger that is being used.
174	–	*/
175	–	private Logger _logger = ReferenceManager.getInstance().getLogger();
176	–
171		//---STATIC ATTRIBUTES---
172
173		//---INNER CLASSES---
#	Line 186 | Line 180 | public class IRC__Alerter implements PluginAlerter {
180		*/
181		class IRCBot extends Thread {
182
183	+	public static final String DEFAULT_STARTUP_NOTICE = "i-scream ircbot starting...";
184	+
185		/**
186		* Main thread loop, this part of the class listens for
187		* messages from the server, and acts accordingly. At the
#	Line 197 | Line 193 | public class IRC__Alerter implements PluginAlerter {
193		while(run) {
194		// flag so we can stop the loop
195		boolean doRead = true;
196	+	// get the startup notice
197	+	String startupNotice;
198	+	try {
199	+	startupNotice = ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.startupNotice");
200	+	} catch (PropertyNotFoundException e) {
201	+	startupNotice = DEFAULT_STARTUP_NOTICE;
202	+	_logger.write(this.toString(), Logger.WARNING, "Configuration error: "+e);
203	+	}
204		// connect to the IRC server
205		try {
206		connect();
207	<	sendNotice(ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.startupNotice"));
207	>	sendNotice(startupNotice);
208		} catch(IOException e) {
209		doRead=false;
210		_logger.write(this.toString(), Logger.ERROR, "Error connecting: "+e);
#	Line 236 | Line 240 | public class IRC__Alerter implements PluginAlerter {
240		} catch (NumberFormatException e) {
241		delayTime = DEFAULT_RECONNECT_DELAY;
242		_logger.write(this.toString(), Logger.WARNING, "Erronous Alerter.IRC.reconnectDelay value in configuration using default of " + delayTime + " seconds");
243	<	} catch (org.omg.CORBA.MARSHAL e2) {
243	>	} catch (PropertyNotFoundException e) {
244		delayTime = DEFAULT_RECONNECT_DELAY;
245		_logger.write(this.toString(), Logger.WARNING, "Alerter.IRC.reconnectDelay value unavailable using default of " + delayTime + " seconds");
246		}
#	Line 255 | Line 259 | public class IRC__Alerter implements PluginAlerter {
259		*/
260		public void sendMsg(String msg) {
261		_socketOut.println("PRIVMSG "+_channel+" :"+msg);
262	+	// wait a second before returning...
263	+	// this ensures messages can't be sent too fast
264	+	try {Thread.sleep(1000);} catch (InterruptedException e) {}
265		}
266
267		/**
#	Line 265 | Line 272 | public class IRC__Alerter implements PluginAlerter {
272		*/
273		public void sendPrivMsg(String user, String msg) {
274		_socketOut.println("PRIVMSG "+user+" :"+msg);
275	+	// wait a second before returning...
276	+	// this ensures messages can't be sent too fast
277	+	try {Thread.sleep(1000);} catch (InterruptedException e) {}
278		}
279
280		/**
#	Line 275 | Line 285 | public class IRC__Alerter implements PluginAlerter {
285		public void sendAction(String msg) {
286		char esc = 001;
287		sendMsg(esc+"ACTION "+msg+esc);
288	+	// wait a second before returning...
289	+	// this ensures messages can't be sent too fast
290	+	try {Thread.sleep(1000);} catch (InterruptedException e) {}
291		}
292
293		/**
#	Line 284 | Line 297 | public class IRC__Alerter implements PluginAlerter {
297		*/
298		public void sendNotice(String msg) {
299		_socketOut.println("NOTICE "+_channel+" :"+msg);
300	+	// wait a second before returning...
301	+	// this ensures messages can't be sent too fast
302	+	try {Thread.sleep(1000);} catch (InterruptedException e) {}
303		}
304
305		/**
#	Line 294 | Line 310 | public class IRC__Alerter implements PluginAlerter {
310		public void connect() throws IOException {
311		ConfigurationProxy cp = ConfigurationProxy.getInstance();
312		// setup the socket, reader and writer
313	<	String server = cp.getProperty(_name, "Alerter.IRC.IRCServer");
314	<	int port = Integer.parseInt(cp.getProperty(_name, "Alerter.IRC.IRCPort"));
313	>	String server;
314	>	int port;
315	>	try {
316	>	server = cp.getProperty(_name, "Alerter.IRC.IRCServer");
317	>	port = Integer.parseInt(cp.getProperty(_name, "Alerter.IRC.IRCPort"));
318	>	} catch (PropertyNotFoundException e) {
319	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
320	>	throw new IOException("Can't get irc server details due to configuration error");
321	>	} catch (NumberFormatException e) {
322	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
323	>	throw new IOException("Can't get irc server details due to malformed configuration");
324	>	}
325		_socket = new Socket(server, port);
326		_socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
327		_socketOut = new PrintWriter(_socket.getOutputStream(), true);
328		//_socketOut.println("PASS");
329		// send USER details
330	<	String user = cp.getProperty(_name, "Alerter.IRC.user");
331	<	String comment = cp.getProperty(_name, "Alerter.IRC.comment");
330	>	String user, comment;
331	>	try {
332	>	user = cp.getProperty(_name, "Alerter.IRC.user");
333	>	comment = cp.getProperty(_name, "Alerter.IRC.comment");
334	>	} catch (PropertyNotFoundException e) {
335	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
336	>	throw new IOException("Can't get user details due to configuration error");
337	>	}
338		_socketOut.println("USER "+user+" 8 * :"+comment);
339		// attempt to get a nick
340	<	String nickList = cp.getProperty(_name, "Alerter.IRC.nickList");
340	>	String nickList;
341	>	try {
342	>	nickList = cp.getProperty(_name, "Alerter.IRC.nickList");
343	>	} catch (PropertyNotFoundException e) {
344	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
345	>	throw new IOException("Can't get nickname due to configuration error");
346	>	}
347		StringTokenizer st = new StringTokenizer(nickList, ";");
348		boolean ok = false;
349		// try until we exhaust our list
#	Line 337 | Line 375 | public class IRC__Alerter implements PluginAlerter {
375		throw new IOException("All nicknames in use");
376		}
377		// join the channel
378	<	_channel = cp.getProperty(_name, "Alerter.IRC.channel");
378	>	try {
379	>	_channel = cp.getProperty(_name, "Alerter.IRC.channel");
380	>	} catch (PropertyNotFoundException e) {
381	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
382	>	throw new IOException("Can't get channel name due to configuration error");
383	>	}
384		_socketOut.println("JOIN "+_channel);
385		// allow alerts
386		_active = true;
#	Line 363 | Line 406 | public class IRC__Alerter implements PluginAlerter {
406		* Overrides the {@link java.lang.Object#toString() Object.toString()}
407		* method to provide clean logging (every class should have this).
408		*
409	<	* This uses the uk.ac.ukc.iscream.util.NameFormat class
409	>	* This uses the uk.org.iscream.util.NameFormat class
410		* to format the toString()
411		*
412		* @return the name of this class and its CVS revision
#	Line 388 | Line 431 | public class IRC__Alerter implements PluginAlerter {
431		_socketOut.println("PONG" + line.substring(4));
432		}
433		// see if it's for us
434	<	else if(getMsg(line).startsWith(_nickname+",")
435	<	|| getMsg(line).startsWith(_nickname+":")
436	<	|| getMsg(line).startsWith(_nickname+" ")) {
434	>	else if(getMsg(line).startsWith(_nickname+",") || getMsg(line).startsWith(_nickname+":") || getMsg(line).startsWith(_nickname+" ")) {
435	>	// setup some String's
436	>	String stopCommand, startCommand, timeSinceLastAlertCommand, lastAlertCommand, joinCommand;
437	>	String nickChangeCommand, versionCommand, helpCommand, statCommand, uptimeCommand;
438	>	// get the command set
439	>	try {
440	>	stopCommand = cp.getProperty(_name, "Alerter.IRC.stopCommand");
441	>	startCommand = cp.getProperty(_name, "Alerter.IRC.startCommand");
442	>	timeSinceLastAlertCommand = cp.getProperty(_name, "Alerter.IRC.timeSinceLastAlertCommand");
443	>	lastAlertCommand = cp.getProperty(_name, "Alerter.IRC.lastAlertCommand");
444	>	joinCommand = cp.getProperty(_name, "Alerter.IRC.joinCommand");
445	>	nickChangeCommand = cp.getProperty(_name, "Alerter.IRC.nickChangeCommand");
446	>	versionCommand = cp.getProperty(_name, "Alerter.IRC.versionCommand");
447	>	helpCommand = cp.getProperty(_name, "Alerter.IRC.helpCommand");
448	>	statCommand = cp.getProperty(_name, "Alerter.IRC.statCommand");
449	>	uptimeCommand = cp.getProperty(_name, "Alerter.IRC.uptimeCommand");
450	>	} catch (PropertyNotFoundException e) {
451	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
452	>	// lets bail from handling this line...
453	>	// ...it's gonna be hard without a command set!
454	>	return;
455	>	}
456	>
457		// we have a message for us
458		String message = getMsg(line).substring(_nickname.length());
459	<	if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.stopCommand"))!=-1) {
459	>	if(message.indexOf(stopCommand)!=-1) {
460		_active = false;
461		sendMsg(getMsgSender(line)+", alerts have been stopped");
462		}
463	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.startCommand"))!=-1) {
463	>	else if(message.indexOf(startCommand)!=-1) {
464		_active = true;
465		sendMsg(getMsgSender(line)+", alerts have been activated");
466		}
467		// this needs to go here if it contains the same words as the lastAlertCommand
468	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.timeSinceLastAlertCommand"))!=-1) {
468	>	else if(message.indexOf(timeSinceLastAlertCommand)!=-1) {
469		if(_lastAlertTime != -1) {
470		long uptime = (System.currentTimeMillis() - _lastAlertTime) / 1000;
471		String uptimeText = DateUtils.formatTime(uptime, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
#	Line 412 | Line 475 | public class IRC__Alerter implements PluginAlerter {
475		sendMsg(getMsgSender(line)+", I've never sent an alert!");
476		}
477		}
478	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.lastAlertCommand"))!=-1) {
478	>	else if(message.indexOf(lastAlertCommand)!=-1) {
479		if(_lastAlertTime != -1) {
480		String date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.UK).format(new Date(_lastAlertTime));
481		sendMsg(getMsgSender(line)+", last alert was at "+date+"; "+_lastAlert);
#	Line 422 | Line 485 | public class IRC__Alerter implements PluginAlerter {
485		}
486
487		}
488	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.joinCommand"))!=-1) {
489	<	String joinCmd = cp.getProperty(_name, "Alerter.IRC.joinCommand");
488	>	else if(message.indexOf(joinCommand)!=-1) {
489	>	String joinCmd = joinCommand;
490		String newChan = message.substring(message.indexOf(joinCmd) + joinCmd.length() + 1);
491		int endOfChan = newChan.indexOf(" ");
492		if(endOfChan == -1) {
493		endOfChan = newChan.length();
494		}
495		newChan = newChan.substring(0, endOfChan);
496	<	sendMsg(getMsgSender(line)+", okay, I'm off to "+newChan);
497	<	_socketOut.println("PART "+_channel);
498	<	_socketOut.println("JOIN "+newChan);
499	<	_channel = newChan;
496	>	if(newChan.equals(_channel)) {
497	>	sendMsg(getMsgSender(line)+", I'm already on "+newChan+"!");
498	>	} else {
499	>	sendMsg(getMsgSender(line)+", okay, I'm off to "+newChan);
500	>	_socketOut.println("PART "+_channel);
501	>	_socketOut.println("JOIN "+newChan);
502	>	_channel = newChan;
503	>	}
504		}
505	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.nickChangeCommand"))!=-1) {
506	<	String nickChangeCmd = cp.getProperty(_name, "Alerter.IRC.nickChangeCommand");
505	>	else if(message.indexOf(nickChangeCommand)!=-1) {
506	>	String nickChangeCmd = nickChangeCommand;
507		String newNick = message.substring(message.indexOf(nickChangeCmd) + nickChangeCmd.length() + 1);
508		int endOfNick = newNick.indexOf(" ");
509		if(endOfNick == -1) {
#	Line 447 | Line 514 | public class IRC__Alerter implements PluginAlerter {
514		_socketOut.println("NICK "+newNick);
515		_nickname = newNick;
516		}
517	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.versionCommand"))!=-1) {
517	>	else if(message.indexOf(versionCommand)!=-1) {
518		sendMsg(getMsgSender(line)+", I am version "+REVISION.substring(11, REVISION.length() -2)+" of the i-scream alerting bot");
519		}
520	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.helpCommand"))!=-1) {
520	>	else if(message.indexOf(helpCommand)!=-1) {
521		sendPrivMsg(getMsgSender(line), "Hello, I am the i-scream alerting bot version "+REVISION.substring(11, REVISION.length() -2));
522		sendPrivMsg(getMsgSender(line), "I understand the following commands;");
523	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.stopCommand"));
524	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.startCommand"));
525	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.lastAlertCommand"));
526	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.joinCommand"));
527	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.nickChangeCommand"));
528	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.statCommand"));
529	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.uptimeCommand"));
530	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.timeSinceLastAlertCommand"));
531	<	sendPrivMsg(getMsgSender(line), cp.getProperty(_name, "Alerter.IRC.helpCommand"));
523	>	sendPrivMsg(getMsgSender(line), stopCommand);
524	>	sendPrivMsg(getMsgSender(line), startCommand);
525	>	sendPrivMsg(getMsgSender(line), lastAlertCommand);
526	>	sendPrivMsg(getMsgSender(line), joinCommand);
527	>	sendPrivMsg(getMsgSender(line), nickChangeCommand);
528	>	sendPrivMsg(getMsgSender(line), statCommand);
529	>	sendPrivMsg(getMsgSender(line), uptimeCommand);
530	>	sendPrivMsg(getMsgSender(line), timeSinceLastAlertCommand);
531	>	sendPrivMsg(getMsgSender(line), helpCommand);
532		}
533	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.statCommand"))!=-1) {
534	<	sendMsg(getMsgSender(line)+", I have sent a total of "+_alertCount+" alerts!");
533	>	else if(message.indexOf(statCommand)!=-1) {
534	>	sendMsg(getMsgSender(line)+", I have sent a total of "+_alertCount+" alerts, and ignored a total of "+_ignoredCount+"!");
535		}
536	<	else if(message.indexOf(cp.getProperty(_name, "Alerter.IRC.uptimeCommand"))!=-1) {
536	>	else if(message.indexOf(uptimeCommand)!=-1) {
537		long uptime = (System.currentTimeMillis() - _startTime) / 1000;
538		String uptimeText = DateUtils.formatTime(uptime, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
539		sendMsg(getMsgSender(line)+", I have been running for "+uptimeText);
540		}
541	+	else if(message.indexOf("ping")!=-1) {
542	+	sendMsg("pong");
543	+	}
544		else if(message.indexOf("do a jibble dance")!=-1) {
545		// little joke :)
546		sendAction("jives to the funky beat shouting \"ii--screeeaaammm\"");
547		}
548		else {
549	<	sendMsg(getMsgSender(line)+", "+cp.getProperty(_name, "Alerter.IRC.rejectMessage"));
549	>	String rejectMessage = NOT_CONFIGURED;
550	>	try {
551	>	rejectMessage = cp.getProperty(_name, "Alerter.IRC.rejectMessage");
552	>	} catch(PropertyNotFoundException e) {
553	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
554	>	}
555	>	sendMsg(getMsgSender(line)+", "+rejectMessage);
556		}
557		}
558		else if(line.indexOf(_nickname)!=-1 && line.indexOf(_channel)!=-1 && line.indexOf("KICK")!=-1) {
559		sendPrivMsg(getMsgSender(line), "That wasn't a nice thing to do...");
560	<	_channel = cp.getProperty(_name, "Alerter.IRC.channel");
560	>	try {
561	>	_channel = cp.getProperty(_name, "Alerter.IRC.channel");
562	>	} catch(PropertyNotFoundException e) {
563	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
564	>	}
565		_socketOut.println("JOIN "+_channel);
566		}
567		}
#	Line 547 | Line 627 | public class IRC__Alerter implements PluginAlerter {
627		* A reminder of our current nickname...
628		*/
629		private String _nickname;
630	+
631	+	/**
632	+	* This holds a reference to the
633	+	* system logger that is being used.
634	+	*/
635	+	protected Logger _logger = ReferenceManager.getInstance().getLogger();
636
637		}
638

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines