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
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/EMail__Alerter.java (file contents):
Revision 1.9 by ajm, Sun Mar 4 02:41:16 2001 UTC vs.
Revision 1.11 by tdb, Mon Mar 5 02:09:49 2001 UTC

# Line 71 | Line 71 | public class EMail__Alerter implements PluginAlerter {
71                  // set our sender
72                  smtp.setSender(cp.getProperty(_name, "Alerter.EMail.sender"));
73                  
74 <                // set the to list
75 <                StringTokenizer st = new StringTokenizer(cp.getProperty(_name, "Alerter.EMail.destList"), ";");
74 >                // get the default destination list
75 >                String destList = cp.getProperty(_name, "Alerter.EMail.defaultDestList");
76 >                // check if the source we're alerting about has a specific destination
77 >                String sourceDestList = cp.getProperty("Host."+alert.getSource(), "Alerter.EMail.destList");
78 >                if(sourceDestList != null) {
79 >                    // if there is a source destination list, use it
80 >                    destList = sourceDestList;
81 >                }
82 >                
83 >                // set the to: list
84 >                StringTokenizer st = new StringTokenizer(destList, ";");
85                  while (st.hasMoreTokens()) {
86                      smtp.setTo(st.nextToken());
87                  }
# Line 86 | Line 95 | public class EMail__Alerter implements PluginAlerter {
95                  out.println(message);
96                  smtp.sendMessage();
97                  smtp.close();
98 <                _logger.write(toString(), Logger.DEBUG, "Sending " + _name + " at "+ levelName + " level");
98 >                _logger.write(toString(), Logger.DEBUG, "Sending " + _name + " at "+ alertType + " level");
99              }
100              catch(IOException e) {
101                  _logger.write(toString(), Logger.ERROR, "Error whilst sending message: "+e);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines