diff options
author | Robert Speicher <robert@gitlab.com> | 2016-08-24 22:42:02 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-08-24 22:42:02 +0000 |
commit | 9ea01f32fe4355179da6082742b6ad06f9603388 (patch) | |
tree | 2d90474171f7909eb4601f610c95dd1a029c548a /lib/api/api.rb | |
parent | f52cf56e90b2be3edb405fe588c94b637cf5088b (diff) | |
parent | 170885edd6f3ea52792511586778e0dce8021cf7 (diff) | |
download | gitlab-ce-9ea01f32fe4355179da6082742b6ad06f9603388.tar.gz |
Merge branch 'add-sentry-logging-to-api' into 'master'
Add Sentry logging to API calls
## What does this MR do?
This MR adds support for Sentry logging in the API.
## Are there points in the code the reviewer needs to double check?
Since the `Grape::Middleware` doesn't have a `params` method, I had to define one using the Rack Request.
## Why was this MR needed?
We are missing a lot of useful errors in the API causing git push/pull errors
## What are the relevant issue numbers?
#21043
See merge request !5882
Diffstat (limited to 'lib/api/api.rb')
-rw-r--r-- | lib/api/api.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 6b8bfbbdae6..ecbd5a6e2fa 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -18,22 +18,14 @@ module API end rescue_from :all do |exception| - # lifted from https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb#L60 - # why is this not wrapped in something reusable? - trace = exception.backtrace - - message = "\n#{exception.class} (#{exception.message}):\n" - message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code) - message << " " << trace.join("\n ") - - API.logger.add Logger::FATAL, message - rack_response({ 'message' => '500 Internal Server Error' }.to_json, 500) + handle_api_exception(exception) end format :json content_type :txt, "text/plain" # Ensure the namespace is right, otherwise we might load Grape::API::Helpers + helpers ::SentryHelper helpers ::API::Helpers mount ::API::AccessRequests |