From 885c02dbd8b40d654f4a84fca8474ff88bc7ca5e Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 10 Sep 2014 11:29:30 +0200 Subject: [PATCH] CLOUDSTACK-7528: More verbose logging when sending alert fails 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 --- server/src/com/cloud/alert/AlertManagerImpl.java | 2 +- usage/src/com/cloud/usage/UsageAlertManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java index 3786443f23b..d8f51ea9d49 100755 --- a/server/src/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/com/cloud/alert/AlertManagerImpl.java @@ -240,7 +240,7 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi _emailAlert.sendAlert(alertType, dataCenterId, podId, null, subject, body); } else { s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " - + podId + " // clusterId:: " + null + " // message:: " + subject ); + + podId + " // clusterId:: " + null + " // 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 index 01e6bec7ff3..480bf479c02 100644 --- a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java +++ b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java @@ -103,7 +103,7 @@ public class UsageAlertManagerImpl extends ManagerBase implements AlertManager { _emailAlert.sendAlert(alertType, dataCenterId, podId, subject, body); } else { s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " - + podId + " // clusterId:: " + null + " // message:: " + subject ); + + podId + " // clusterId:: " + null + " // message:: " + subject + " // body:: " + body); } } catch (Exception ex) { s_logger.error("Problem sending email alert", ex);