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/EMail__Alerter.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/EMail__Alerter.java (file contents):
Revision 1.20 by ajm, Thu Mar 22 23:35:22 2001 UTC vs.
Revision 1.21 by tdb, Fri Mar 23 00:05:24 2001 UTC

#	Line 36 | Line 36 | public class EMail__Alerter extends AlerterSkeleton {
36		//---PUBLIC METHODS---
37
38		public void sendAlert(Alert alert) {
39	<	String alertType = Alert.alertLevels[alert.getLevel()];
40	<	// sort out the subject
39	>	// get the subject and replace fields
40		String subject;
41		try {
42		subject = _cp.getProperty(_name, "Alerter.EMail.subject");
#	Line 47 | Line 46 | public class EMail__Alerter extends AlerterSkeleton {
46		}
47		subject = processAlertMessage(subject, alert);
48
49	<	// sort out the message body
49	>	// get the message body and replace fields
50		String message;
51		try {
52		message = _cp.getProperty(_name, "Alerter.EMail.message");
#	Line 56 | Line 55 | public class EMail__Alerter extends AlerterSkeleton {
55		_logger.write(toString(), Logger.WARNING, "Alerter.EMail.message value unavailable using default of " + message);
56		}
57		message = processAlertMessage(message, alert);
58	<
58	>
59	>	// attempt to send the actual message
60		try {
61		// create SMTP message
62		Smtp smtp = new Smtp(_cp.getProperty(_name, "Alerter.EMail.smtpServer"));
63		// set our sender
64		smtp.setSender(_cp.getProperty(_name, "Alerter.EMail.sender"));
65
66	+	// list of destination addresses
67		String destList = _cp.getProperty("Host."+alert.getSource(), "Alerter.EMail.destList");
68
69		// set the to: list
#	Line 73 | Line 74 | public class EMail__Alerter extends AlerterSkeleton {
74
75		// prepare to print the message
76		PrintWriter out = smtp.getOutputStream();
77	<	out.println("Subject: "+subject);
77	<	out.println();
77	>	out.println("Subject: "+subject+"\n");
78
79		// send the message
80		out.println(message);
81		smtp.sendMessage();
82		smtp.close();
83	<	_logger.write(toString(), Logger.DEBUG, "Sending " + _name + " at "+ alertType + " level");
83	>	_logger.write(toString(), Logger.DEBUG, "Sending " + _name + " at "+ Alert.alertLevels[alert.getLevel()] + " level");
84		}
85		catch(IOException e) {
86		_logger.write(toString(), Logger.ERROR, "Error whilst sending message: "+e);

Diff Legend

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