From 06fa257080ab8de7986ad5debbf317eddf5608e7 Mon Sep 17 00:00:00 2001
From: Alex Lewis <alex.lewis001@gmail.com>
Date: Tue, 10 Dec 2013 11:41:36 -0500
Subject: [PATCH] issue-350: Fixes issue when an apostrophe is present in a User's name
---
src/main/java/com/gitblit/manager/NotificationManager.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/NotificationManager.java b/src/main/java/com/gitblit/manager/NotificationManager.java
index eae563f..a226d1a 100644
--- a/src/main/java/com/gitblit/manager/NotificationManager.java
+++ b/src/main/java/com/gitblit/manager/NotificationManager.java
@@ -32,7 +32,7 @@
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.MailExecutor;
+import com.gitblit.service.MailService;
/**
* The notification manager dispatches notifications. Currently, email is the
@@ -50,26 +50,27 @@
private final IStoredSettings settings;
- private final MailExecutor mailExecutor;
+ private final MailService mailExecutor;
public NotificationManager(IStoredSettings settings) {
this.settings = settings;
- this.mailExecutor = new MailExecutor(settings);
+ this.mailExecutor = new MailService(settings);
}
@Override
- public IManager setup() {
+ public NotificationManager start() {
if (mailExecutor.isReady()) {
- logger.info("Mail executor is scheduled to process the message queue every 2 minutes.");
- scheduledExecutor.scheduleAtFixedRate(mailExecutor, 1, 2, TimeUnit.MINUTES);
+ int period = 2;
+ logger.info("Mail service will process the queue every {} minutes.", period);
+ scheduledExecutor.scheduleAtFixedRate(mailExecutor, 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;
}
--
Gitblit v1.9.1