Empty the purge queue even for failed requests (otherwise we will be endlessly polling the Varnish server until its fixed). Administrators should check the logs for failed purges.

2 files changed, 2 insertions, 4 deletions

diff --git a/app/models/purge_request.rb b/app/models/purge_request.rb
index 9bf1a0641..088d5b84b 100644
--- a/app/models/purge_request.rb
+++ b/app/models/purge_request.rb
@@ -31,9 +31,7 @@ class PurgeRequest < ActiveRecord::Base
         config = MySociety::Config.load_default()
         varnish_url = config['VARNISH_HOST']
         result = quietly_try_to_purge(varnish_url, self.url)
-        if result == "200"
-            self.delete()
-        end
+        self.delete()
     end
 end
 
diff --git a/spec/models/purge_request_spec.rb b/spec/models/purge_request_spec.rb
index f7d01f784..94fe01317 100644
--- a/spec/models/purge_request_spec.rb
+++ b/spec/models/purge_request_spec.rb
@@ -26,7 +26,7 @@ describe PurgeRequest, "purging things" do
         req.save()
         PurgeRequest.all().count.should == 1
         PurgeRequest.purge_all()
-        PurgeRequest.all().count.should == 1
+        PurgeRequest.all().count.should == 0
     end
 end