#294 - not failing service startup if smtp fails to start

1 files changed, 13 insertions, 0 deletions

diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py
index 6bbe0051..d5236e8e 100644
--- a/service/pixelated/bitmask_libraries/smtp.py
+++ b/service/pixelated/bitmask_libraries/smtp.py
@@ -13,12 +13,16 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+import logging
 import os
 import requests
 from .certs import which_bundle
 from leap.mail.smtp import setup_smtp_gateway
 
 
+logger = logging.getLogger(__name__)
+
+
 class LeapSmtp(object):
 
     TWISTED_PORT = 4650
@@ -86,6 +90,15 @@ class LeapSmtp(object):
             encrypted_only=False
         )
 
+    def ensure_running(self):
+        if not self._smtp_service:
+            try:
+                self.start()
+            except Exception as e:
+                logger.warning("Couldn't start the SMTP server now, will try again when the user tries to use it")
+                return False
+        return True
+
     def stop(self):
         if self._smtp_service is not None:
             self._smtp_port.stopListening()