Merge branch 'develop' into debian/experimental

1 files changed, 10 insertions, 4 deletions

diff --git a/src/leap/mail/imap/service/imap.py b/src/leap/mail/imap/service/imap.py
index c3ae59a..a50611b 100644
--- a/src/leap/mail/imap/service/imap.py
+++ b/src/leap/mail/imap/service/imap.py
@@ -28,7 +28,7 @@ from twisted.internet.protocol import ServerFactory
 from twisted.mail import imap4
 from twisted.python import log
 
-from leap.common.events import emit, catalog
+from leap.common.events import emit_async, catalog
 from leap.common.check import leap_check
 from leap.mail.imap.account import IMAPAccount
 from leap.mail.imap.server import LEAPIMAPServer
@@ -158,8 +158,14 @@ def run_service(store, **kwargs):
     factory = LeapIMAPFactory(uuid, userid, store)
 
     try:
+        interface = "localhost"
+        # don't bind just to localhost if we are running on docker since we
+        # won't be able to access imap from the host
+        if os.environ.get("LEAP_DOCKERIZED"):
+            interface = ''
+
         tport = reactor.listenTCP(port, factory,
-                                  interface="localhost")
+                                  interface=interface)
     except CannotListenError:
         logger.error("IMAP Service failed to start: "
                      "cannot listen in port %s" % (port,))
@@ -178,10 +184,10 @@ def run_service(store, **kwargs):
             reactor.listenTCP(manhole.MANHOLE_PORT, manhole_factory,
                               interface="127.0.0.1")
         logger.debug("IMAP4 Server is RUNNING in port  %s" % (port,))
-        emit(catalog.IMAP_SERVICE_STARTED, str(port))
+        emit_async(catalog.IMAP_SERVICE_STARTED, str(port))
 
         # FIXME -- change service signature
         return tport, factory
 
     # not ok, signal error.
-    emit(catalog.IMAP_SERVICE_FAILED_TO_START, str(port))
+    emit_async(catalog.IMAP_SERVICE_FAILED_TO_START, str(port))