simplify catch for custom domain resolv issues

This commit is contained in:
Kyle Drake 2024-02-18 14:28:50 -06:00
parent 3fcbb116fe
commit 2aa30eaa28

View file

@ -155,17 +155,7 @@ post '/settings/:username/custom_domain' do
begin begin
Socket.gethostbyname @site.values[:domain] Socket.gethostbyname @site.values[:domain]
rescue SocketError, ResolutionError => e rescue SocketError, ResolutionError => e
if e.message =~ /name or service not known/i flash[:error] = "The domain isn't setup to use Neocities yet, cannot add. Please make the A and CNAME record changes where you registered your domain."
flash[:error] = 'Domain needs to be valid and already registered.'
redirect "/settings/#{@site.username}#custom_domain"
elsif e.message =~ /No address associated with hostname/i
#flash[:error] = "The domain isn't setup to use Neocities yet, cannot add. Please make the A and CNAME record changes where you registered your domain."
#redirect "/settings/#{@site.username}#custom_domain"
else
raise e
end
rescue Socket::ResolutionError
flash[:error] = 'Temporary failure in name resolution, please try again later.'
redirect "/settings/#{@site.username}#custom_domain" redirect "/settings/#{@site.username}#custom_domain"
end end