modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
| 27 +++++-----
1 file changed, 14 insertions(+), 13 deletions(-)
New commits:
commit e67beedcbfcf016cae615c4fd02d83dae2562349
Author: Heiko W. Rupp <pilhuhn(a)fedorapeople.org>
Date: Mon Nov 30 16:30:52 2009 +0100
Use the defined alert sender
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
index 0c1a1a5..8946a8f 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
@@ -662,20 +662,21 @@ public class AlertManagerBean implements AlertManagerLocal,
AlertManagerRemote {
sendAlertSnmpTrap(alert, snmpNotification);
}
- }
- AlertNotification test = new AlertNotification(alert.getAlertDefinition());
- test.setSenderName("Email");
- test.setConfiguration(new Configuration());
- Property prop = new
PropertySimple("emailAddress","hwr(a)redhat.com");
- test.getConfiguration().getProperties().add(prop);
- AlertSender sender = getAlertSender(test);
- if (sender!=null) {
- try {
- SenderResult result = sender.send(alert);
- }
- catch (Throwable t) {
- log.error("Sender failed: " + t.getMessage());
+
+ // Send over the new AlertSenders
+ if (alertNotification.getSenderName()==null)
+ continue;
+
+ AlertSender sender = getAlertSender(alertNotification);
+ if (sender!=null) {
+ try {
+ SenderResult result = sender.send(alert);
+ // TODO log result
+ }
+ catch (Throwable t) {
+ log.error("Sender failed: " + t.getMessage());
+ }
}
}
Show replies by date