projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into refactor/discoverable_user_field
[akkoma]
/
lib
/
pleroma
/
emails
/
mailer.ex
diff --git
a/lib/pleroma/emails/mailer.ex
b/lib/pleroma/emails/mailer.ex
index 8b1bdef754d0a0b23c0a7727ef4fc9b15dc05d6e..5108c71c8a3b63e93ebee8825713ae0205af1952 100644
(file)
--- a/
lib/pleroma/emails/mailer.ex
+++ b/
lib/pleroma/emails/mailer.ex
@@
-35,6
+35,11
@@
defmodule Pleroma.Emails.Mailer do
def deliver(email, config \\ [])
def deliver(email, config) do
def deliver(email, config \\ [])
def deliver(email, config) do
+ # temporary hackney fix until hackney max_connections bug is fixed
+ # https://git.pleroma.social/pleroma/pleroma/-/issues/2101
+ email =
+ Swoosh.Email.put_private(email, :hackney_options, ssl_options: [versions: [:"tlsv1.2"]])
+
case enabled?() do
true -> Swoosh.Mailer.deliver(email, parse_config(config))
false -> {:error, :deliveries_disabled}
case enabled?() do
true -> Swoosh.Mailer.deliver(email, parse_config(config))
false -> {:error, :deliveries_disabled}