about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-08-13 22:17:29 +0200
committerThibaut Girka <thib@sitedethib.com>2020-08-13 22:17:29 +0200
commitda62e350e0b4bcf1f683c48169294d761fd901f1 (patch)
tree14709b118d680ffc93ee12620565087397190b27 /lib
parent660188c9008761ae38d0e82dea841f7d90e199f9 (diff)
parent0f38f9726a0a9d8e13633424d03e79f54df047a4 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/email_domain_blocks_cli.rb2
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|