This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 73c393df3094b57440fd58cf3a6806155a3162c2 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 3 11:32:22 2017 +0200 fixes #46 Remove DevMode --- pollen-services/src/main/config/PollenServices.ini | 8 ------ .../pollen/services/service/mail/EmailService.java | 30 ++++++++++++---------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/pollen-services/src/main/config/PollenServices.ini b/pollen-services/src/main/config/PollenServices.ini index 0dee8b98..91ebed00 100644 --- a/pollen-services/src/main/config/PollenServices.ini +++ b/pollen-services/src/main/config/PollenServices.ini @@ -1,13 +1,5 @@ description = PollenServicesConfig.description -[option devMode] -description = pollen.configuration.devMode -key = pollen.devMode -type = Boolean -defaultValue = false -transient = true -final = true - [option dataDirectory] description = pollen.configuration.data.directory key = pollen.data.directory diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java index f2d15d13..fbc640e1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java @@ -299,19 +299,7 @@ public class EmailService extends PollenServiceSupport { } public void send(PollenMail mail) { - if (getPollenServiceConfig().isDevMode()) { - if (log.isInfoEnabled()) { - log.info("an email should have been sent if not in devMode: tos = " + - mail.getTos() + ". subject = '" + mail.getSubject() + "'. body = \n" + getBody(mail)); - } - if (log.isWarnEnabled()) { - if (!mail.isRecipientProvided()) { - log.warn("email has no recipient, would not have been sent " + mail); - } - } - } else { - doSend(mail); - } + doSend(mail); } public void resendEmails() { @@ -389,7 +377,20 @@ public class EmailService extends PollenServiceSupport { protected void doSend(String subject, String body, Collection<String> tos, Collection<String> bccs) throws EmailException { - PollenServicesConfig applicationConfig = getPollenServiceConfig(); + PollenServicesConfig applicationConfig = getPollenServiceConfig(); + + if (applicationConfig.getSmtpHost() == null) { + if (log.isInfoEnabled()) { + log.info("an email should have been sent if not in devMode: tos = " + + tos + ". subject = '" + subject + "'. body = \n" + body); + } + if (log.isWarnEnabled()) { + if ((tos == null || tos.isEmpty()) && (bccs == null || bccs.isEmpty())) { + log.warn("email has no recipient, would not have been sent"); + } + } + + } else { Email newEmail = new SimpleEmail(); newEmail.setHostName(applicationConfig.getSmtpHost()); @@ -406,6 +407,7 @@ public class EmailService extends PollenServiceSupport { } newEmail.setMsg(body); newEmail.send(); + } } protected String getBody(PollenMail mail) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.