Repository: incubator-kylin Updated Branches: refs/heads/2.x-staging ccf020718 -> d5a676ab6
KYLIN-1057 add detail log to trace error Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d5a676ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d5a676ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d5a676ab Branch: refs/heads/2.x-staging Commit: d5a676ab6cf9c3657f33ba3ec2377624ebc10a92 Parents: ccf0207 Author: qianhao.zhou <qianz...@ebay.com> Authored: Thu Nov 19 10:52:28 2015 +0800 Committer: qianhao.zhou <qianz...@ebay.com> Committed: Thu Nov 19 10:52:28 2015 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/common/util/MailService.java | 6 +----- .../org/apache/kylin/job/execution/AbstractExecutable.java | 9 ++++++--- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d5a676ab/core-common/src/main/java/org/apache/kylin/common/util/MailService.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/MailService.java b/core-common/src/main/java/org/apache/kylin/common/util/MailService.java index 77eddcf..3b0a4e1 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/MailService.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/MailService.java @@ -41,15 +41,11 @@ public class MailService { private static final Log logger = LogFactory.getLog(MailService.class); - public MailService() { - this(KylinConfig.getInstanceFromEnv()); - } - public MailService(KylinConfig config) { this("true".equalsIgnoreCase(config.getProperty(KylinConfig.MAIL_ENABLED, "false")), config.getProperty(KylinConfig.MAIL_HOST, ""), config.getProperty(KylinConfig.MAIL_USERNAME, ""), config.getProperty(KylinConfig.MAIL_PASSWORD, ""), config.getProperty(KylinConfig.MAIL_SENDER, "")); } - public MailService(boolean enabled, String host, String username, String password, String sender) { + private MailService(boolean enabled, String host, String username, String password, String sender) { this.enabled = enabled; this.host = host; this.username = username; http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d5a676ab/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java index 49a2c80..7ba328d 100644 --- a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java +++ b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java @@ -199,26 +199,29 @@ public abstract class AbstractExecutable implements Executable, Idempotent { try { List<String> users = Lists.newArrayList(); users.addAll(getNotifyList()); - final String adminDls = KylinConfig.getInstanceFromEnv().getAdminDls(); + final KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv(); + final String adminDls = kylinConfig.getAdminDls(); if (null != adminDls) { for (String adminDl : adminDls.split(",")) { users.add(adminDl); } } if (users.isEmpty()) { + logger.warn("no need to send email, user list is empty"); return; } final Pair<String, String> email = formatNotifications(context, state); if (email == null) { + logger.warn("no need to send email, content is null"); return; } logger.info("prepare to send email to:" + users); logger.info("job name:" + getName()); logger.info("submitter:" + getSubmitter()); logger.info("notify list:" + users); - new MailService().sendMail(users, email.getLeft(), email.getRight()); + new MailService(kylinConfig).sendMail(users, email.getLeft(), email.getRight()); } catch (Exception e) { - logger.error(e.getLocalizedMessage(), e); + logger.error("error send email", e); } }
