diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /workhorse/raven.go | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'workhorse/raven.go')
-rw-r--r-- | workhorse/raven.go | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/workhorse/raven.go b/workhorse/raven.go new file mode 100644 index 00000000000..f641203f142 --- /dev/null +++ b/workhorse/raven.go @@ -0,0 +1,40 @@ +package main + +import ( + "net/http" + "os" + + raven "github.com/getsentry/raven-go" + + "gitlab.com/gitlab-org/gitlab-workhorse/internal/helper" +) + +func wrapRaven(h http.Handler) http.Handler { + // Use a custom environment variable (not SENTRY_DSN) to prevent + // clashes with gitlab-rails. + sentryDSN := os.Getenv("GITLAB_WORKHORSE_SENTRY_DSN") + sentryEnvironment := os.Getenv("GITLAB_WORKHORSE_SENTRY_ENVIRONMENT") + raven.SetDSN(sentryDSN) // sentryDSN may be empty + + if sentryEnvironment != "" { + raven.SetEnvironment(sentryEnvironment) + } + + if sentryDSN == "" { + return h + } + + raven.DefaultClient.SetRelease(Version) + + return http.HandlerFunc(raven.RecoveryHandler( + func(w http.ResponseWriter, r *http.Request) { + defer func() { + if p := recover(); p != nil { + helper.CleanHeadersForRaven(r) + panic(p) + } + }() + + h.ServeHTTP(w, r) + })) +} |