AO3-6911: add timeout page as catch to Rack::Timeout::RequestTimeoutE…

…xception
otwcode · Feb 20, 2025 · c420089 · c420089
1 parent 775ed13
commit c420089
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 0 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -25,6 +25,12 @@ def raise_not_found
     redirect_to '/404'
   end
 
+  rescue_from Rack::Timeout::RequestTimeoutException, with: :raise_timeout
+
+  def raise_timeout
+    redirect_to '/timeout'
+  end
+
   helper :all # include all helpers, all the time
 
   include HtmlCleaner

diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
@@ -8,4 +8,8 @@ class ErrorsController < ApplicationController
   def auth_error
     @page_subtitle = "Auth Error"
   end
+
+  def timeout_error
+    @page_subtitle = "Timeout Error"
+  end
 end
diff --git a/app/views/errors/timeout.html.erb b/app/views/errors/timeout.html.erb
@@ -0,0 +1,2 @@
+<h3 class="heading">The page was responding too slowly. Please try again after a few minutes.</h3>
+<p>If you still get this error after a few tries, you can  <%= link_to ts('contact Support'), new_feedback_report_path %>. In the form, please include a link to the page you're trying to reach and what action you are taking.</p>
diff --git a/config/routes.rb b/config/routes.rb
@@ -53,6 +53,7 @@
   get '/422', to: 'errors#422'
   get '/500', to: 'errors#500'
   get '/auth_error', to: 'errors#auth_error'
+  get '/timeout', to: 'errors#timeout'
 
   #### DOWNLOADS ####
 

diff --git a/spec/controllers/errors_controller_spec.rb b/spec/controllers/errors_controller_spec.rb
@@ -28,4 +28,20 @@
       expect(response.header["Content-Type"]).to eq("text/html; charset=utf-8")
     end
   end
+
+  describe "auth_error" do
+    it "returns an HTML auth error page" do
+      get :auth_error
+      expect(response.status).to eq(200)
+      expect(response.header["Content-Type"]).to eq("text/html; charset=utf-8")
+    end
+  end
+
+  describe "timeout" do
+    it "returns an HTML timeout error page" do
+      get :timeout
+      expect(response.status).to eq(200)
+      expect(response.header["Content-Type"]).to eq("text/html; charset=utf-8")
+    end
+  end
 end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<h3 class="heading">The page was responding too slowly. Please try again after a few minutes.</h3>
		<p>If you still get this error after a few tries, you can <%= link_to ts('contact Support'), new_feedback_report_path %>. In the form, please include a link to the page you're trying to reach and what action you are taking.</p>
Check failure on line 2 in app/views/errors/timeout.html.erb View workflow job for this annotation GitHub Actions / ERB Lint runner `[] reported by reviewdog 🐶 Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping. Raw Output: app/views/errors/timeout.html.erb:2:74: Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.`