CLOUDSTACK-7528: More verbose logging when sending alert fails

yadvr · yadvr · commit 91fd8d7cd5d5 · 2014-09-10T11:38:47.000+02:00
When sendAlert is called on an AlertManager impl, if it fails it logs that something was wrong but does not log the body of the issue/error. This means we tell the user/admin that there was an issue but don't share the "issue" with them at all as the email alert fail (or that they were not initialized). Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> (cherry picked from commit 885c02d) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: server/src/com/cloud/alert/AlertManagerImpl.java usage/src/com/cloud/usage/UsageAlertManagerImpl.java
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -252,7 +252,7 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, String
                 _emailAlert.sendAlert(alertType, dataCenterId, podId, null, subject, body);
             } else {
                 s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId +
-                    " // message:: " + subject);
+                    " // message:: " + subject + " // body:: " + body);
             }
         } catch (Exception ex) {
             s_logger.error("Problem sending email alert", ex);
diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
@@ -105,7 +105,7 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, String
                 _emailAlert.sendAlert(alertType, dataCenterId, podId, subject, body);
             } else {
                 s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null +
-                    " // message:: " + subject);
+                    " // message:: " + subject + " // body:: " + body);
             }
         } catch (Exception ex) {
             s_logger.error("Problem sending email alert", ex);

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, String`
`252`	`252`	`_emailAlert.sendAlert(alertType, dataCenterId, podId, null, subject, body);`
`253`	`253`	`} else {`
`254`	`254`	`s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId +`
`255`		`- " // message:: " + subject);`
	`255`	`+ " // message:: " + subject + " // body:: " + body);`
`256`	`256`	`}`
`257`	`257`	`} catch (Exception ex) {`
`258`	`258`	`s_logger.error("Problem sending email alert", ex);`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, String`
`105`	`105`	`_emailAlert.sendAlert(alertType, dataCenterId, podId, subject, body);`
`106`	`106`	`} else {`
`107`	`107`	`s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null +`
`108`		`- " // message:: " + subject);`
	`108`	`+ " // message:: " + subject + " // body:: " + body);`
`109`	`109`	`}`
`110`	`110`	`} catch (Exception ex) {`
`111`	`111`	`s_logger.error("Problem sending email alert", ex);`