From 4fd0d2192cb4cbd0907528497f4f0d14a840146e Mon Sep 17 00:00:00 2001 From: destne Date: Mon, 16 Nov 2020 17:52:28 +0100 Subject: [PATCH 1/4] add try --- lib/bamboo/adapters/smtp_adapter.ex | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/bamboo/adapters/smtp_adapter.ex b/lib/bamboo/adapters/smtp_adapter.ex index 1cc3e0b..6a9a756 100644 --- a/lib/bamboo/adapters/smtp_adapter.ex +++ b/lib/bamboo/adapters/smtp_adapter.ex @@ -71,11 +71,18 @@ defmodule Bamboo.SMTPAdapter do config |> to_gen_smtp_server_config - email - |> Bamboo.Mailer.normalize_addresses() - |> to_gen_smtp_message - |> config[:transport].send_blocking(gen_smtp_config) - |> handle_response + response = + try do + email + |> Bamboo.Mailer.normalize_addresses() + |> to_gen_smtp_message + |> config[:transport].send_blocking(gen_smtp_config) + catch + e -> + handle_response({:error, e}) + end + + handle_response(response) end @doc false @@ -96,7 +103,12 @@ defmodule Bamboo.SMTPAdapter do raise SMTPError, {reason, detail} end + defp handle_response({:error, detail}) do + raise SMTPError, {:not_specified, detail} + end + defp handle_response(response) do + Logger.debug("WTF: #{response} ") {:ok, response} end From 764b7d621851aba5a8995743ac9fec5723b80ab3 Mon Sep 17 00:00:00 2001 From: destne Date: Mon, 16 Nov 2020 17:58:04 +0100 Subject: [PATCH 2/4] remove log --- lib/bamboo/adapters/smtp_adapter.ex | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bamboo/adapters/smtp_adapter.ex b/lib/bamboo/adapters/smtp_adapter.ex index 6a9a756..a6a9a15 100644 --- a/lib/bamboo/adapters/smtp_adapter.ex +++ b/lib/bamboo/adapters/smtp_adapter.ex @@ -108,7 +108,6 @@ defmodule Bamboo.SMTPAdapter do end defp handle_response(response) do - Logger.debug("WTF: #{response} ") {:ok, response} end From a91b9a834d2d8b3ab85774d694121140a00b1126 Mon Sep 17 00:00:00 2001 From: Matheus Bueno Date: Tue, 17 Nov 2020 09:04:29 +0100 Subject: [PATCH 3/4] Update lib/bamboo/adapters/smtp_adapter.ex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastien Rivière --- lib/bamboo/adapters/smtp_adapter.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bamboo/adapters/smtp_adapter.ex b/lib/bamboo/adapters/smtp_adapter.ex index a6a9a15..35c1e70 100644 --- a/lib/bamboo/adapters/smtp_adapter.ex +++ b/lib/bamboo/adapters/smtp_adapter.ex @@ -79,7 +79,7 @@ defmodule Bamboo.SMTPAdapter do |> config[:transport].send_blocking(gen_smtp_config) catch e -> - handle_response({:error, e}) + raise SMTPError, {:not_specified, detail} end handle_response(response) From e5b8c9fd9a765d6715648396961386cddc225848 Mon Sep 17 00:00:00 2001 From: destne Date: Tue, 17 Nov 2020 09:12:30 +0100 Subject: [PATCH 4/4] directly raise --- lib/bamboo/adapters/smtp_adapter.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bamboo/adapters/smtp_adapter.ex b/lib/bamboo/adapters/smtp_adapter.ex index 35c1e70..20e0b2e 100644 --- a/lib/bamboo/adapters/smtp_adapter.ex +++ b/lib/bamboo/adapters/smtp_adapter.ex @@ -79,7 +79,7 @@ defmodule Bamboo.SMTPAdapter do |> config[:transport].send_blocking(gen_smtp_config) catch e -> - raise SMTPError, {:not_specified, detail} + raise SMTPError, {:not_specified, e} end handle_response(response)