diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-05 17:24:09 +0300 |
---|---|---|
committer | Mark Fletcher <mark@gitlab.com> | 2018-03-07 16:46:35 +0300 |
commit | 43304ec08c54aa00075815026130afed573233e6 (patch) | |
tree | c11186640f852c82f7533320b1edaa59fe64a450 /config | |
parent | 6846dad292bd7693859012a5b27158d1a995ddae (diff) |
Merge branch 'backport-ee-5049-to-ce' into 'master'
Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4747 to CE
See merge request gitlab-org/gitlab-ce!17520
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/forbid_sidekiq_in_transactions.rb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb index cb611aa21df..4cf1d455eb4 100644 --- a/config/initializers/forbid_sidekiq_in_transactions.rb +++ b/config/initializers/forbid_sidekiq_in_transactions.rb @@ -18,13 +18,26 @@ module Sidekiq %i(perform_async perform_at perform_in).each do |name| define_method(name) do |*args| if !Sidekiq::Worker.skip_transaction_check && AfterCommitQueue.inside_transaction? - raise Sidekiq::Worker::EnqueueFromTransactionError, <<~MSG + begin + raise Sidekiq::Worker::EnqueueFromTransactionError, <<~MSG `#{self}.#{name}` cannot be called inside a transaction as this can lead to race conditions when the worker runs before the transaction is committed and tries to access a model that has not been saved yet. Use an `after_commit` hook, or include `AfterCommitQueue` and use a `run_after_commit` block instead. - MSG + MSG + rescue Sidekiq::Worker::EnqueueFromTransactionError => e + if Rails.env.production? + Rails.logger.error(e.message) + + if Gitlab::Sentry.enabled? + Gitlab::Sentry.context + Raven.capture_exception(e) + end + else + raise + end + end end super(*args) |