diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-13 23:10:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 23:10:19 +0200 |
| commit | 6fece522f9dca9d13ae2d4437b395a92ddb106c9 (patch) | |
| tree | 882f9cf298e9dffa985f214b28a877b08cf19752 /lib | |
| parent | 660188c9008761ae38d0e82dea841f7d90e199f9 (diff) | |
| parent | 0f71372d6337f695a87c7158c52b93e49acc215d (diff) | |
Merge pull request #1404 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/email_domain_blocks_cli.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/email_domain_blocks_cli.rb b/lib/mastodon/email_domain_blocks_cli.rb index 7fe1efaaa..55a637d68 100644 --- a/lib/mastodon/email_domain_blocks_cli.rb +++ b/lib/mastodon/email_domain_blocks_cli.rb @@ -63,7 +63,7 @@ module Mastodon ips = [] Resolv::DNS.open do |dns| - dns.timeouts = 1 + dns.timeouts = 5 hostnames = dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s } ([email_domain_block.domain] + hostnames).uniq.each do |hostname| |