From 80b3f6b0be4ef3f653247cc52a1e72d5e9d7dd3c Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sun, 23 Oct 2016 12:52:44 -0500
Subject: [PATCH] Use http.rb to ensure timeout enforcement for cache purging,
 disable crashing flag for now

---
 workers/delete_cache_worker.rb | 11 ++++-------
 workers/purge_cache_worker.rb  |  9 +++------
 workers/screenshot_worker.rb   |  7 ++++---
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/workers/delete_cache_worker.rb b/workers/delete_cache_worker.rb
index e1514e5d..633b2a42 100644
--- a/workers/delete_cache_worker.rb
+++ b/workers/delete_cache_worker.rb
@@ -23,12 +23,9 @@ class DeleteCacheWorker
       "http://#{proxy_ip}/:cache/purge#{path}",
       Addressable::URI::CharacterClasses::QUERY
     )
-    begin
-      RestClient::Request.execute method: :get, url: url, timeout: HTTP_TIMEOUT, headers: {
-        host: URI::encode("#{username}.neocities.org")
-      }
-    rescue RestClient::ResourceNotFound
-    rescue RestClient::Forbidden
-    end
+
+    HTTP.timeout(read: 10, write: 10, connect: 2).
+      headers(host: URI::encode("#{username}.neocities.org")).
+      get(url)
   end
 end
diff --git a/workers/purge_cache_worker.rb b/workers/purge_cache_worker.rb
index 1b1bfd03..c1c445e3 100644
--- a/workers/purge_cache_worker.rb
+++ b/workers/purge_cache_worker.rb
@@ -22,17 +22,14 @@ class PurgeCacheWorker
     retry_encoded = false
 
     begin
-      RestClient::Request.execute method: :head, url: url, timeout: HTTP_TIMEOUT, headers: {
-        host: URI::encode("#{username}.neocities.org"),
-        cache_purge: '1'
-      }
+      HTTP.timeout(read: 10, write: 10, connect: 2).
+        headers(host: URI::encode("#{username}.neocities.org"), cache_purge: '1').
+        head(url)
     rescue URI::InvalidURIError
       raise if retry_encoded == true
       url = URI.encode url
       retry_encoded = true
       retry
-    rescue RestClient::ResourceNotFound
-    rescue RestClient::Forbidden
     end
   end
 end
diff --git a/workers/screenshot_worker.rb b/workers/screenshot_worker.rb
index 51eb21c5..c39cfc16 100644
--- a/workers/screenshot_worker.rb
+++ b/workers/screenshot_worker.rb
@@ -83,9 +83,10 @@ class ScreenshotWorker
 
   sidekiq_retries_exhausted do |msg|
     username, path = msg['args']
-    site = Site[username: username]
-    site.is_crashing = true
-    site.save_changes validate: false
+    # This breaks too much so we're disabling it.
+    #site = Site[username: username]
+    #site.is_crashing = true
+    #site.save_changes validate: false
 
 =begin
         if site.email