From 1fc3120363177107ab205f9f5b19d1aff5a746a2 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sat, 18 Jun 2016 21:25:41 +0000
Subject: [PATCH] deduping code and fixes for letsencrypt

---
 public/banned_sites/.gitignore |  0
 workers/lets_encrypt_worker.rb | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 delete mode 100644 public/banned_sites/.gitignore

diff --git a/public/banned_sites/.gitignore b/public/banned_sites/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/workers/lets_encrypt_worker.rb b/workers/lets_encrypt_worker.rb
index 30949805..5efbb462 100644
--- a/workers/lets_encrypt_worker.rb
+++ b/workers/lets_encrypt_worker.rb
@@ -9,6 +9,16 @@ class LetsEncryptWorker
   end
 
   def perform(site_id)
+
+    # Dispose of dupes
+
+    queue = Sidekiq::Queue.new self.class.sidekiq_options_hash['queue']
+    queue.each do |job|
+      if job.args == [site_id] && job.jid != jid
+        job.delete
+      end
+    end
+
     letsencrypt = Acme::Client.new(
       private_key: OpenSSL::PKey::RSA.new(File.read($config['letsencrypt_key'])),
       endpoint: $config['letsencrypt_endpoint']
@@ -32,8 +42,8 @@ class LetsEncryptWorker
     attempts = 0
 
     begin
-      raise VerificationTimeoutError if attempts == 5
-      raise NotAuthorizedYet if challenge.verify_status != 'valid'
+      raise VerificationTimeoutError if attempts == 30
+      raise NotAuthorizedYetError if challenge.verify_status != 'valid'
     rescue NotAuthorizedYet
       sleep 5
       attempts += 1