KBP-140 #time 10m - Code was improved

lab2023 · Nov 21, 2017 · f058b96 · f058b96
1 parent 1fa9310
commit f058b96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/cybele/helpers/error_pages.rb b/lib/cybele/helpers/error_pages.rb
@@ -6,7 +6,7 @@ module ErrorPages
       def configure_error_pages
         inject_into_file 'app/controllers/application_controller.rb',
                          template_content('error_pages/error_control.erb'),
-                         before: 'self.responder'
+                         after: 'class ApplicationController < ActionController::Base'
 
         inject_into_file 'app/controllers/application_controller.rb',
                          template_content('error_pages/error_method.erb'),

diff --git a/templates/error_pages/error_control.erb b/templates/error_pages/error_control.erb
@@ -1,5 +1,7 @@
 
-  rescue_from Exception, with: :server_error if Rails.env.production? or Rails.env.staging?
-  rescue_from ActiveRecord::RecordNotFound, with: :page_not_found if Rails.env.production? or Rails.env.staging?
-  rescue_from ActionController::RoutingError, with: :page_not_found if Rails.env.production? or Rails.env.staging?
 
+  if Rails.env.production? || Rails.env.staging?
+    rescue_from Exception, with: :server_error
+    rescue_from ActiveRecord::RecordNotFound, with: :page_not_found
+    rescue_from ActionController::RoutingError, with: :page_not_found
+  end
diff --git a/templates/error_pages/error_route.erb b/templates/error_pages/error_route.erb
@@ -1,4 +1,4 @@
 
-  if Rails.env.production? or Rails.env.staging?
+  if Rails.env.production? || Rails.env.staging?
     match '*unmatched_route', to: 'application#page_not_found', via: :all
   end