From 21df0daeacdbc6fedab788f745d3525d342bd7a8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 02 Jul 2014 17:27:44 -0400
Subject: [PATCH] Update to SLF4j 1.7.7
---
src/main/java/com/gitblit/manager/NotificationManager.java | 114 +++++++++++++++++++--------------------------------------
1 files changed, 38 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/NotificationManager.java b/src/main/java/com/gitblit/manager/NotificationManager.java
index eae563f..69a611b 100644
--- a/src/main/java/com/gitblit/manager/NotificationManager.java
+++ b/src/main/java/com/gitblit/manager/NotificationManager.java
@@ -15,24 +15,20 @@
*/
package com.gitblit.manager;
-import java.text.MessageFormat;
import java.util.Collection;
-import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMultipart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.MailExecutor;
+import com.gitblit.models.Mailing;
+import com.gitblit.service.MailService;
/**
* The notification manager dispatches notifications. Currently, email is the
@@ -50,28 +46,34 @@
private final IStoredSettings settings;
- private final MailExecutor mailExecutor;
+ private final MailService mailService;
public NotificationManager(IStoredSettings settings) {
this.settings = settings;
- this.mailExecutor = new MailExecutor(settings);
+ this.mailService = new MailService(settings);
}
@Override
- public IManager setup() {
- if (mailExecutor.isReady()) {
- logger.info("Mail executor is scheduled to process the message queue every 2 minutes.");
- scheduledExecutor.scheduleAtFixedRate(mailExecutor, 1, 2, TimeUnit.MINUTES);
+ public NotificationManager start() {
+ if (mailService.isReady()) {
+ int period = 2;
+ logger.info("Mail service will process the queue every {} minutes.", period);
+ scheduledExecutor.scheduleAtFixedRate(mailService, 1, period, TimeUnit.MINUTES);
} else {
- logger.warn("Mail server is not properly configured. Mail services disabled.");
+ logger.warn("Mail service disabled.");
}
return this;
}
@Override
- public IManager stop() {
+ public NotificationManager stop() {
scheduledExecutor.shutdownNow();
return this;
+ }
+
+ @Override
+ public boolean isSendingMail() {
+ return mailService.isReady();
}
/**
@@ -82,8 +84,11 @@
*/
@Override
public void sendMailToAdministrators(String subject, String message) {
- List<String> toAddresses = settings.getStrings(Keys.mail.adminAddresses);
- sendMail(subject, message, toAddresses);
+ Mailing mail = Mailing.newPlain();
+ mail.subject = subject;
+ mail.content = message;
+ mail.setRecipients(settings.getStrings(Keys.mail.adminAddresses));
+ send(mail);
}
/**
@@ -95,41 +100,11 @@
*/
@Override
public void sendMail(String subject, String message, Collection<String> toAddresses) {
- this.sendMail(subject, message, toAddresses.toArray(new String[0]));
- }
-
- /**
- * Notify users by email of something.
- *
- * @param subject
- * @param message
- * @param toAddresses
- */
- @Override
- public void sendMail(String subject, String message, String... toAddresses) {
- if (toAddresses == null || toAddresses.length == 0) {
- logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
- return;
- }
- try {
- Message mail = mailExecutor.createMessage(toAddresses);
- if (mail != null) {
- mail.setSubject(subject);
-
- MimeBodyPart messagePart = new MimeBodyPart();
- messagePart.setText(message, "utf-8");
- messagePart.setHeader("Content-Type", "text/plain; charset=\"utf-8\"");
- messagePart.setHeader("Content-Transfer-Encoding", "quoted-printable");
-
- MimeMultipart multiPart = new MimeMultipart();
- multiPart.addBodyPart(messagePart);
- mail.setContent(multiPart);
-
- mailExecutor.queue(mail);
- }
- } catch (MessagingException e) {
- logger.error("Messaging error", e);
- }
+ Mailing mail = Mailing.newPlain();
+ mail.subject = subject;
+ mail.content = message;
+ mail.setRecipients(toAddresses);
+ send(mail);
}
/**
@@ -141,40 +116,27 @@
*/
@Override
public void sendHtmlMail(String subject, String message, Collection<String> toAddresses) {
- this.sendHtmlMail(subject, message, toAddresses.toArray(new String[0]));
+ Mailing mail = Mailing.newHtml();
+ mail.subject = subject;
+ mail.content = message;
+ mail.setRecipients(toAddresses);
+ send(mail);
}
/**
* Notify users by email of something.
*
- * @param subject
- * @param message
- * @param toAddresses
+ * @param mailing
*/
@Override
- public void sendHtmlMail(String subject, String message, String... toAddresses) {
- if (toAddresses == null || toAddresses.length == 0) {
- logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+ public void send(Mailing mailing) {
+ if (!mailing.hasRecipients()) {
+ logger.debug("Dropping message {} because there are no recipients", mailing.subject);
return;
}
- try {
- Message mail = mailExecutor.createMessage(toAddresses);
- if (mail != null) {
- mail.setSubject(subject);
-
- MimeBodyPart messagePart = new MimeBodyPart();
- messagePart.setText(message, "utf-8");
- messagePart.setHeader("Content-Type", "text/html; charset=\"utf-8\"");
- messagePart.setHeader("Content-Transfer-Encoding", "quoted-printable");
-
- MimeMultipart multiPart = new MimeMultipart();
- multiPart.addBodyPart(messagePart);
- mail.setContent(multiPart);
-
- mailExecutor.queue(mail);
- }
- } catch (MessagingException e) {
- logger.error("Messaging error", e);
+ Message msg = mailService.createMessage(mailing);
+ if (msg != null) {
+ mailService.queue(msg);
}
}
--
Gitblit v1.9.1