Skip to content

Commit

Permalink
skip email on maintenance, shorten toot, add intellij stuff do gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
lfuelling committed Jun 8, 2018
1 parent da3ba33 commit eb40a08
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ npm-debug.log
*.dat
/archived/
/data/
*.iml
/.idea/
21 changes: 13 additions & 8 deletions lib/fd/email/down_email.ex
Original file line number Diff line number Diff line change
@@ -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", "[email protected]"})
|> 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", "[email protected]"})
|> 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
Expand Down
2 changes: 1 addition & 1 deletion lib/fd/instances/crawler.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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, "[email protected]")
post("is undergoing maintenance#{error}", crawler.instance, "[email protected]")
else
post("is down#{error}", crawler.instance, "[email protected]")
end
Expand Down

0 comments on commit eb40a08

Please sign in to comment.