app/controllers/scrivito/webservice_controller.rb in infopark_fiona7-0.71.1.12 vs app/controllers/scrivito/webservice_controller.rb in infopark_fiona7-1.1.0.0.0
- old
+ new
@@ -1,10 +1,11 @@
module Scrivito
class WebserviceController < ActionController::Base
- rescue_from ClientError do |exception|
- @exception = exception
- render 'scrivito/webservice/error', formats: :json, status: exception.http_code
+ rescue_from ApplicationError, ClientError, ResourceNotFound do |error|
+ @error = error
+ @timestamp = Time.zone.now
+ render 'scrivito/webservice/error', formats: :json, status: error.http_code
end
before_filter :merge_correctly_parsed_json_params
before_filter :authorize