Greg Padgett has uploaded a new change for review. Change subject: tools, backend: better error logging for notifierd ......................................................................
tools, backend: better error logging for notifierd If email fails to send, log mail sender properties. Log notifications added to the db Change-Id: Ifa11e841c4724fda310fff63c9783928465d9635 Bug-Url: https://bugzilla.redhat.com/885436 Signed-off-by: Greg Padgett <gpadg...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java M backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java M backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java 3 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/11554/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java index a7d5ad6..f69090e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java @@ -166,4 +166,19 @@ return false; return true; } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + return sb.append("event_notification_hist [") + .append("auditLogId=").append(auditLogId) + .append(", eventName=").append(eventName) + .append(", methodType=").append(methodType) + .append(", reason=").append(reason) + .append(", sentAt=").append(sentAt) + .append(", status=").append(status) + .append(", subscriberId=").append(subscriberId) + .append("]") + .toString(); + } } diff --git a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java index 2e8f035..83e76ce 100644 --- a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java +++ b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java @@ -240,7 +240,7 @@ private void addEventNotificationHistory(event_notification_hist eventHistory) throws SQLException { - + log.info("Adding notification: " + eventHistory); Connection connection = null; CallableStatement cs = null; try { diff --git a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java index 4776fb6..a4a7dca 100644 --- a/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java +++ b/backend/manager/tools/engine-notifier/engine-notifier-service/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java @@ -185,8 +185,27 @@ if (StringUtils.isNotBlank(messageSubject)) { errorMsg.append(" with subject " + messageSubject); } + + boolean firstProperty = true; + for (String key : session.getProperties().stringPropertyNames()) { + errorMsg.append(firstProperty ? " (connection properties: " : ", "); + firstProperty = false; + errorMsg.append(key).append("=").append(session.getProperties().getProperty(key)); + } + if (auth != null) { + if (!firstProperty) { + errorMsg.append(", "); + firstProperty = false; + } + errorMsg.append(auth); + } + if (!firstProperty) { + errorMsg.append(")"); + } + errorMsg.append(" due to to error: " + mex.getMessage()); log.error(errorMsg.toString(), mex); + throw mex; } } @@ -205,5 +224,13 @@ protected PasswordAuthentication getPasswordAuthentication() { return new PasswordAuthentication(userName, password); } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("auth.username=").append(userName); + sb.append(", auth.password=").append(StringUtils.isEmpty(password) ? "" : "********"); + return sb.toString(); + } } } -- To view, visit http://gerrit.ovirt.org/11554 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa11e841c4724fda310fff63c9783928465d9635 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadg...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
