Rethrow ActionController::UnknownAction exceptions encountered by

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 479f24525bd106277699797d791e9f89af1994c1..0c41170470c3d9b1054be5cb8e4c61a55e3a3b77 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -192,6 +192,8 @@ class ApplicationController < ActionController::Base
       report_error message, :bad_request
     rescue OSM::APIError => ex
       report_error ex.message, ex.status
       report_error message, :bad_request
     rescue OSM::APIError => ex
       report_error ex.message, ex.status

+    rescue ActionController::UnknownAction => ex
+      raise

     rescue Exception => ex
       logger.info("API threw unexpected #{ex.class} exception: #{ex.message}")
       ex.backtrace.each { |l| logger.info(l) }
     rescue Exception => ex
       logger.info("API threw unexpected #{ex.class} exception: #{ex.message}")
       ex.backtrace.each { |l| logger.info(l) }


@@ -208,9 +210,11 @@ class ApplicationController < ActionController::Base
   end
 
   def api_call_timeout
   end
 
   def api_call_timeout

-    Timeout::timeout(APP_CONFIG['api_timeout'], OSM::APITimeoutError) do
+    SystemTimer.timeout_after(APP_CONFIG['api_timeout']) do

       yield
     end
       yield
     end

+  rescue Timeout::Error
+    raise OSM::APITimeoutError

   end
 
   ##
   end
 
   ##


@@ -226,6 +230,8 @@ class ApplicationController < ActionController::Base
       case
       when user.nil? then user = :none
       when user.display_name == controller.params[:display_name] then user = :self
       case
       when user.nil? then user = :none
       when user.display_name == controller.params[:display_name] then user = :self

+      when user.administrator? then user = :administrator
+      when user.moderator? then user = :moderator

       else user = :other
       end
 
       else user = :other
       end
 


@@ -240,7 +246,7 @@ class ApplicationController < ActionController::Base
   ##
   # extend expire_action to expire all variants
   def expire_action(options = {})
   ##
   # extend expire_action to expire all variants
   def expire_action(options = {})

-    path = fragment_cache_key(options).gsub('?', '.').gsub(':', '.')
+    path = ActionCachePath.path_for(self, options, false).gsub('?', '.').gsub(':', '.')

     expire_fragment(Regexp.new(Regexp.escape(path) + "\\..*"))
   end
 
     expire_fragment(Regexp.new(Regexp.escape(path) + "\\..*"))
   end