From 6132875b6bde6ec281af4ef39447ff3af4ec9451 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 17 Sep 2016 17:51:56 +0000 Subject: [PATCH] A few fixes for lets encrypt error handling --- workers/lets_encrypt_worker.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/workers/lets_encrypt_worker.rb b/workers/lets_encrypt_worker.rb index 40d18ece..bdb4f4b3 100644 --- a/workers/lets_encrypt_worker.rb +++ b/workers/lets_encrypt_worker.rb @@ -78,18 +78,26 @@ class LetsEncryptWorker begin auth = letsencrypt.authorize domain: domain challenge = auth.http01 - rescue Acme::Client::Error => e - if e =~ /Internationalized domain names.+not yet supported/ + rescue => e + if e.message =~ /Internationalized domain names.+not yet supported/ @international_domain = true - puts "This is an internationalized domain, and so is not yet supported." + puts "This is an internationalized domain, and so is not yet supported. Skipping to next" + next + else + raise e end end + if challenge.nil? + puts "challenge object is nil, going to next domain" + next + end + begin FileUtils.mkdir_p File.join(site.base_files_path, File.dirname(challenge.filename)) File.write File.join(site.base_files_path, challenge.filename), challenge.file_content rescue => e - put "FAILED TO WRITE CHALLENGE: #{site.domain} #{challenge.filename}" + puts "FAILED TO WRITE CHALLENGE: #{site.domain} #{challenge.filename}" # A verification needs to be attempted anyways, otherwise 300 of them will jam up the system for a week end