--- projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java 2001/03/24 03:47:50 1.26 +++ projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java 2001/03/24 18:43:38 1.27 @@ -18,7 +18,7 @@ import java.text.DateFormat; * IRCBot inner class. * * @author $Author: tdb $ - * @version $Id: IRC__Alerter.java,v 1.26 2001/03/24 03:47:50 tdb Exp $ + * @version $Id: IRC__Alerter.java,v 1.27 2001/03/24 18:43:38 tdb Exp $ */ public class IRC__Alerter extends AlerterSkeleton { @@ -27,7 +27,7 @@ public class IRC__Alerter extends AlerterSkeleton { /** * The current CVS revision of this class */ - public final String REVISION = "$Revision: 1.26 $"; + public final String REVISION = "$Revision: 1.27 $"; /** * A description of this alerter @@ -64,19 +64,18 @@ public class IRC__Alerter extends AlerterSkeleton { * @param alert the alert to send */ public void sendAlert(Alert alert) { + // sort out the message + String alertType = Alert.alertLevels[alert.getLevel()]; + String message; + try { + message = _cp.getProperty(_name, "Alerter.IRC.message"); + } catch (PropertyNotFoundException e) { + message = NOT_CONFIGURED; + _logger.write(toString(), Logger.WARNING, "Alerter.IRC.message value unavailable using default of " + message); + } + message = processAlertMessage(message, alert); // only send alerts if we're active - if(_active) { - // sort out the message - String alertType = Alert.alertLevels[alert.getLevel()]; - String message; - try { - message = _cp.getProperty(_name, "Alerter.IRC.message"); - } catch (PropertyNotFoundException e) { - message = NOT_CONFIGURED; - _logger.write(toString(), Logger.WARNING, "Alerter.IRC.message value unavailable using default of " + message); - } - message = processAlertMessage(message, alert); - + if(_active) { // send the message _logger.write(toString(), Logger.DEBUG, "Sending " + _name + " at "+ alertType + " level"); _ircbot.sendMsg(message);