Merge branch 'pull/5338'

[rails.git] / app / controllers / api / traces_controller.rb

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index 956bcde6e82dccabb23e022919d0d87673e74ec3..76dfb3a2dc1bd4b6d57728b17b3f074894ef88cd 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,16 +1,13 @@
 module Api
   class TracesController < ApiController
-    before_action :check_database_readable, :except => [:show, :data]
-    before_action :check_database_writable, :only => [:create, :update, :destroy]
+    before_action :check_api_writable, :only => [:create, :update, :destroy]
     before_action :set_locale
     before_action :authorize
 
     authorize_resource
 
-    before_action :check_api_readable, :only => [:show, :data]
-    before_action :check_api_writable, :only => [:create, :update, :destroy]
     before_action :offline_error, :only => [:create, :destroy, :data]
-    around_action :api_call_handle_error
+    skip_around_action :api_call_timeout, :only => :create
 
     def show
       @trace = Trace.visible.find(params[:id])