From 07653079e85fa89c9dd8f47ba301fa470a1e9c10 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 28 Apr 2021 15:25:30 +0300 Subject: [PATCH] Don't fail oban job when provision_ssl_certificates fails --- lib/workers/provision_ssl_certificates.ex | 10 ++++++++-- test/workers/provision_ssl_certificates_test.exs | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/lib/workers/provision_ssl_certificates.ex b/lib/workers/provision_ssl_certificates.ex index 48873eb00..1f232ab1e 100644 --- a/lib/workers/provision_ssl_certificates.ex +++ b/lib/workers/provision_ssl_certificates.ex @@ -23,7 +23,7 @@ defmodule Plausible.Workers.ProvisionSslCertificates do ) for domain <- recent_custom_domains do - {:ok, res, code} = + res = ssh.run( conn, 'sudo certbot certonly --webroot -w /root/webroot -n -d \"#{domain.domain}\"', @@ -31,7 +31,13 @@ defmodule Plausible.Workers.ProvisionSslCertificates do exec_timeout: @timeout ) - report_result({res, code}, domain) + case res do + {:ok, msg, code} -> + report_result({msg, code}, domain) + + e -> + Logger.warn("Error obtaining SSL certificate for #{domain.domain}: #{inspect(e)}") + end end :ok diff --git a/test/workers/provision_ssl_certificates_test.exs b/test/workers/provision_ssl_certificates_test.exs index 0584f8688..07b929813 100644 --- a/test/workers/provision_ssl_certificates_test.exs +++ b/test/workers/provision_ssl_certificates_test.exs @@ -46,4 +46,18 @@ defmodule Plausible.Workers.SslCertificatesTest do domain = Repo.get_by(Plausible.Site.CustomDomain, site_id: site.id) refute domain.has_ssl_certificate end + + test "does not set has_ssl_certficate=true if the ssh command errors completely" do + site = insert(:site) + insert(:custom_domain, site: site, domain: "custom-site.com") + + ssh_stub = + stub(SSHEx, :connect, fn _cmd -> {:ok, nil} end) + |> stub(:run, fn _conn, _cmd, _opts -> {:error, "msg"} end) + + ProvisionSslCertificates.perform(nil, ssh_stub) + + domain = Repo.get_by(Plausible.Site.CustomDomain, site_id: site.id) + refute domain.has_ssl_certificate + end end