diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index 15b258dd9d..08074ef762 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -528,7 +528,7 @@ class Event(EventMixin, LoggedModel): return locking.LockManager(self) - def get_mail_backend(self, force_custom=False): + def get_mail_backend(self, timeout=None, force_custom=False): """ Returns an email server connection, either by using the system-wide connection or by returning a custom one based on the event's settings. @@ -542,7 +542,7 @@ class Event(EventMixin, LoggedModel): password=self.settings.smtp_password, use_tls=self.settings.smtp_use_tls, use_ssl=self.settings.smtp_use_ssl, - fail_silently=False) + fail_silently=False, timeout=timeout) else: return get_connection(fail_silently=False) diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py index cb30c9afef..bcc7770942 100644 --- a/src/pretix/control/views/event.py +++ b/src/pretix/control/views/event.py @@ -594,7 +594,7 @@ class MailSettings(EventSettingsViewMixin, EventSettingsFormView): ) if request.POST.get('test', '0').strip() == '1': - backend = self.request.event.get_mail_backend(force_custom=True) + backend = self.request.event.get_mail_backend(force_custom=True, timeout=10) try: backend.test(self.request.event.settings.mail_from) except Exception as e: