Repository: cloudstack
Updated Branches:
refs/heads/4.4 bd8eaf86f -> 015276350
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).
(cherry picked from commit 91fd8d7cd5d5a83bf75f5f2972ad2eb2a4a07694)
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
server/src/com/cloud/alert/AlertManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4f5ea3c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4f5ea3c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4f5ea3c
Branch: refs/heads/4.4
Commit: f4f5ea3cc02d931416579514a3289a607f7c5cac
Parents: bd8eaf8
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Authored: Wed Sep 10 11:29:30 2014 +0200
Committer: Rohit Yadav <rohit.ya...@shapeblue.com>
Committed: Wed Sep 10 11:45:02 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/alert/AlertManagerImpl.java | 2 +-
usage/src/com/cloud/usage/UsageAlertManagerImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4f5ea3c/server/src/com/cloud/alert/AlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java
b/server/src/com/cloud/alert/AlertManagerImpl.java
index 2a343d5..fc5b5fd 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -252,7 +252,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);
+ " // message:: " + subject + " // body:: " + body);
}
} catch (Exception ex) {
s_logger.error("Problem sending email alert", ex);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4f5ea3c/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
index 67bb702..3c55f57 100644
--- a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
@@ -105,7 +105,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);
+ " // message:: " + subject + " // body:: " + body);
}
} catch (Exception ex) {
s_logger.error("Problem sending email alert", ex);
