From 74221eb302e782ef23777d5c3f0a649ceb321c1e Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 5 Jun 2014 10:23:58 -0400 Subject: Add method to INotificationManager to return email service status --- src/main/java/com/gitblit/FederationClient.java | 5 +++++ src/main/java/com/gitblit/manager/GitblitManager.java | 5 +++++ src/main/java/com/gitblit/manager/INotificationManager.java | 8 ++++++++ src/main/java/com/gitblit/manager/NotificationManager.java | 5 +++++ 4 files changed, 23 insertions(+) (limited to 'src') diff --git a/src/main/java/com/gitblit/FederationClient.java b/src/main/java/com/gitblit/FederationClient.java index c3dcd9da..cd06c3cb 100644 --- a/src/main/java/com/gitblit/FederationClient.java +++ b/src/main/java/com/gitblit/FederationClient.java @@ -165,6 +165,11 @@ public class FederationClient { return this; } + @Override + public boolean isSendingMail() { + return false; + } + @Override public void sendMailToAdministrators(String subject, String message) { } diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java index ef2433dd..98ad33e7 100644 --- a/src/main/java/com/gitblit/manager/GitblitManager.java +++ b/src/main/java/com/gitblit/manager/GitblitManager.java @@ -660,6 +660,11 @@ public class GitblitManager implements IGitblit { * NOTIFICATION MANAGER */ + @Override + public boolean isSendingMail() { + return notificationManager.isSendingMail(); + } + @Override public void sendMailToAdministrators(String subject, String message) { notificationManager.sendMailToAdministrators(subject, message); diff --git a/src/main/java/com/gitblit/manager/INotificationManager.java b/src/main/java/com/gitblit/manager/INotificationManager.java index 231cf43a..64fc01e8 100644 --- a/src/main/java/com/gitblit/manager/INotificationManager.java +++ b/src/main/java/com/gitblit/manager/INotificationManager.java @@ -21,6 +21,14 @@ import com.gitblit.models.Mailing; public interface INotificationManager extends IManager { + /** + * Returns true if the email service is configured and ready to send notifications. + * + * @return true if the email service is operational + * @since 1.6.0 + */ + boolean isSendingMail(); + /** * Notify the administrators by email. * diff --git a/src/main/java/com/gitblit/manager/NotificationManager.java b/src/main/java/com/gitblit/manager/NotificationManager.java index ba63cfc1..69a611bb 100644 --- a/src/main/java/com/gitblit/manager/NotificationManager.java +++ b/src/main/java/com/gitblit/manager/NotificationManager.java @@ -71,6 +71,11 @@ public class NotificationManager implements INotificationManager { return this; } + @Override + public boolean isSendingMail() { + return mailService.isReady(); + } + /** * Notify the administrators by email. * -- cgit v1.2.3