Merge pull request #1050 from alphagov/suppress-rummager-errors

Catch rummager errors for navigation

app/lib/services.rb

@@ -13,6 +13,7 @@ def self.content_store
   end
 
   def self.rummager
-    @rummager ||= GdsApi::Rummager.new(Plek.new.find("rummager"))
+    @rummager ||= GdsApi::Rummager.new(Plek.new.find("rummager"),
+      timeout: 2)
   end
 end

app/services/most_popular_content.rb

@@ -18,6 +18,9 @@ def self.fetch(content_ids:, current_path:, filters:)
 
   def fetch
     search_response["results"]
+  rescue GdsApi::HTTPErrorResponse => e
+    GovukStatsd.increment("govuk_content_pages.most_popular.#{e.class.name.demodulize.downcase}")
+    []
   end
 
 private

app/services/most_recent_content.rb

@@ -14,6 +14,9 @@ def self.fetch(content_ids:, current_path:, filters:)
 
   def fetch
     search_response["results"]
+  rescue GdsApi::HTTPErrorResponse => e
+    GovukStatsd.increment("govuk_content_pages.most_recent.#{e.class.name.demodulize.downcase}")
+    []
   end
 
 private

test/services/most_popular_content_test.rb

@@ -32,6 +32,13 @@ def taxon_content_ids
     assert_equal(results.count, 2)
   end
 
+  test 'catches api errors' do
+    Services.rummager.stubs(:search).raises(GdsApi::HTTPErrorResponse.new(500))
+    results = most_popular_content.fetch
+
+    assert_equal(results, [])
+  end
+
   test 'starts from the first page' do
     assert_includes_params(start: 0) do
       most_popular_content.fetch

test/services/most_recent_content_test.rb

@@ -13,6 +13,13 @@ def most_recent_content
     )
   end
 
+  test 'catches api errors' do
+    Services.rummager.stubs(:search).raises(GdsApi::HTTPErrorResponse.new(500))
+    results = most_recent_content.fetch
+
+    assert_equal(results, [])
+  end
+
   def taxon_content_ids
     ['c3c860fc-a271-4114-b512-1c48c0f82564', 'ff0e8e1f-4dea-42ff-b1d5-f1ae37807af2']
   end