diff options
author | Robert Speicher <robert@gitlab.com> | 2017-08-25 17:44:22 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-08-25 17:44:22 +0000 |
commit | 7fd743ce8760fc4d63a89627225de0b5ea5a5ad2 (patch) | |
tree | cfc842549e2e051124c19c19cbd5ea45b222279a | |
parent | 05127954cc8bf1f3e0a5902da34c21f856021c9a (diff) | |
parent | 32b688e78572803f4557c5f78d1585b3ca6e8fbd (diff) | |
download | gitlab-ce-7fd743ce8760fc4d63a89627225de0b5ea5a5ad2.tar.gz |
Merge branch 'sh-sidekiq-backtrace' into 'master'
Enable 5 lines of Sidekiq backtrace lines to aid in debugging
Closes #27626
See merge request !13822
-rw-r--r-- | app/workers/concerns/exception_backtrace.rb | 8 | ||||
-rw-r--r-- | app/workers/group_destroy_worker.rb | 1 | ||||
-rw-r--r-- | app/workers/namespaceless_project_destroy_worker.rb | 1 | ||||
-rw-r--r-- | app/workers/project_destroy_worker.rb | 1 | ||||
-rw-r--r-- | app/workers/project_export_worker.rb | 1 | ||||
-rw-r--r-- | app/workers/repository_import_worker.rb | 1 |
6 files changed, 13 insertions, 0 deletions
diff --git a/app/workers/concerns/exception_backtrace.rb b/app/workers/concerns/exception_backtrace.rb new file mode 100644 index 00000000000..ea0f1f8d19b --- /dev/null +++ b/app/workers/concerns/exception_backtrace.rb @@ -0,0 +1,8 @@ +# Concern for enabling a few lines of exception backtraces in Sidekiq +module ExceptionBacktrace + extend ActiveSupport::Concern + + included do + sidekiq_options backtrace: 5 + end +end diff --git a/app/workers/group_destroy_worker.rb b/app/workers/group_destroy_worker.rb index 07e82767b06..bd8e212e928 100644 --- a/app/workers/group_destroy_worker.rb +++ b/app/workers/group_destroy_worker.rb @@ -1,6 +1,7 @@ class GroupDestroyWorker include Sidekiq::Worker include DedicatedSidekiqQueue + include ExceptionBacktrace def perform(group_id, user_id) begin diff --git a/app/workers/namespaceless_project_destroy_worker.rb b/app/workers/namespaceless_project_destroy_worker.rb index 1cfb0be759e..f1cd1769421 100644 --- a/app/workers/namespaceless_project_destroy_worker.rb +++ b/app/workers/namespaceless_project_destroy_worker.rb @@ -7,6 +7,7 @@ class NamespacelessProjectDestroyWorker include Sidekiq::Worker include DedicatedSidekiqQueue + include ExceptionBacktrace def self.bulk_perform_async(args_list) Sidekiq::Client.push_bulk('class' => self, 'queue' => sidekiq_options['queue'], 'args' => args_list) diff --git a/app/workers/project_destroy_worker.rb b/app/workers/project_destroy_worker.rb index a9188b78460..3be7e686609 100644 --- a/app/workers/project_destroy_worker.rb +++ b/app/workers/project_destroy_worker.rb @@ -1,6 +1,7 @@ class ProjectDestroyWorker include Sidekiq::Worker include DedicatedSidekiqQueue + include ExceptionBacktrace def perform(project_id, user_id, params) project = Project.find(project_id) diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb index 6009aa1b191..f13ac9e5db2 100644 --- a/app/workers/project_export_worker.rb +++ b/app/workers/project_export_worker.rb @@ -1,6 +1,7 @@ class ProjectExportWorker include Sidekiq::Worker include DedicatedSidekiqQueue + include ExceptionBacktrace sidekiq_options retry: 3 diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 2c2d1e8b91f..00a021abbdc 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -3,6 +3,7 @@ class RepositoryImportWorker include Sidekiq::Worker include DedicatedSidekiqQueue + include ExceptionBacktrace sidekiq_options status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION |