Repository: cloudstack Updated Branches: refs/heads/master 601827e6b -> 0babb92d6
CLOUDSTACK-2697 Removed the clusterId as null from the alert message logs Signed-off-by: Daan Hoogland <d...@onecht.net> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0babb92d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0babb92d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0babb92d Branch: refs/heads/master Commit: 0babb92d62c08afc04aa0df1bbf053539a53c523 Parents: 601827e Author: Girish Chaudhari <girish.chaudh...@sungard.com> Authored: Thu Apr 3 16:32:20 2014 +0000 Committer: Daan Hoogland <d...@onecht.net> Committed: Mon May 5 19:10:17 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/alert/AlertManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0babb92d/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..5b667ad 100755 --- a/server/src/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/com/cloud/alert/AlertManagerImpl.java @@ -251,7 +251,7 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi if (_emailAlert != null) { _emailAlert.sendAlert(alertType, dataCenterId, podId, null, subject, body); } else { - s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null + + s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // message:: " + subject); } } catch (Exception ex) { @@ -750,7 +750,7 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi public void sendAlert(AlertType alertType, long dataCenterId, Long podId, Long clusterId, String subject, String content) throws MessagingException, UnsupportedEncodingException { s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + - podId + " // clusterId:: " + null + " // message:: " + subject); + podId + " // clusterId:: " + clusterId + " // message:: " + subject); AlertVO alert = null; if ((alertType != AlertManager.AlertType.ALERT_TYPE_HOST) && (alertType != AlertManager.AlertType.ALERT_TYPE_USERVM) &&
