From 74221eb302e782ef23777d5c3f0a649ceb321c1e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jun 2014 10:23:58 -0400
Subject: [PATCH] Add method to INotificationManager to return email service status
---
src/main/java/com/gitblit/manager/INotificationManager.java | 8 ++++++++
src/main/java/com/gitblit/FederationClient.java | 5 +++++
src/main/java/com/gitblit/manager/GitblitManager.java | 5 +++++
src/main/java/com/gitblit/manager/NotificationManager.java | 5 +++++
4 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/FederationClient.java b/src/main/java/com/gitblit/FederationClient.java
index c3dcd9d..cd06c3c 100644
--- a/src/main/java/com/gitblit/FederationClient.java
+++ b/src/main/java/com/gitblit/FederationClient.java
@@ -166,6 +166,11 @@
}
@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 ef2433d..98ad33e 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -661,6 +661,11 @@
*/
@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 231cf43..64fc01e 100644
--- a/src/main/java/com/gitblit/manager/INotificationManager.java
+++ b/src/main/java/com/gitblit/manager/INotificationManager.java
@@ -22,6 +22,14 @@
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.
*
* @param subject
diff --git a/src/main/java/com/gitblit/manager/NotificationManager.java b/src/main/java/com/gitblit/manager/NotificationManager.java
index ba63cfc..69a611b 100644
--- a/src/main/java/com/gitblit/manager/NotificationManager.java
+++ b/src/main/java/com/gitblit/manager/NotificationManager.java
@@ -71,6 +71,11 @@
return this;
}
+ @Override
+ public boolean isSendingMail() {
+ return mailService.isReady();
+ }
+
/**
* Notify the administrators by email.
*
--
Gitblit v1.9.1