diff --git a/.gitignore b/.gitignore index 650ab35..20ac11a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ npm-debug.log *.dat /archived/ /data/ +*.iml +/.idea/ diff --git a/lib/fd/email/down_email.ex b/lib/fd/email/down_email.ex index 679efa7..d3a0712 100644 --- a/lib/fd/email/down_email.ex +++ b/lib/fd/email/down_email.ex @@ -1,16 +1,21 @@ defmodule Fd.DownEmail do + require Logger import Swoosh.Email import Fd.Util, only: [idna: 1] def down_email(instance = %Fd.Instances.Instance{}, check) do - new() - |> to({idna(instance.domain), instance.email}) - |> from({"fediverse.network monitoring", "monitoring@email.fediverse.network"}) - |> reply_to("root+instance-mon-#{instance.id}@fediverse.network") - |> put_bcc("root+instance-mon-#{instance.id}@fediverse.network") - |> subject("#{idna(instance.domain)} is down") - |> html_body(html(instance, check)) - |> text_body(text(instance, check)) + if instance.settings.maintenance_mode? do + Logger.info("Skipping down email for #{instance.domain} because maintenance is planned") + else + new() + |> to({idna(instance.domain), instance.email}) + |> from({"fediverse.network monitoring", "monitoring@email.fediverse.network"}) + |> reply_to("root+instance-mon-#{instance.id}@fediverse.network") + |> put_bcc("root+instance-mon-#{instance.id}@fediverse.network") + |> subject("#{idna(instance.domain)} is down") + |> html_body(html(instance, check)) + |> text_body(text(instance, check)) + end end def login(_), do: :error diff --git a/lib/fd/instances/crawler.ex b/lib/fd/instances/crawler.ex index 005e5cd..aee6c47 100644 --- a/lib/fd/instances/crawler.ex +++ b/lib/fd/instances/crawler.ex @@ -239,7 +239,7 @@ defmodule Fd.Instances.Crawler do "" end if crawler.state.instance.settings.maintenance_mode? do - post("is undergoing planned maintenance#{error}", crawler.instance, "fediversemonitoring@pleroma.fr") + post("is undergoing maintenance#{error}", crawler.instance, "fediversemonitoring@pleroma.fr") else post("is down#{error}", crawler.instance, "fediversemonitoring@pleroma.fr") end