diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-25 01:47:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-25 01:47:37 +0000 |
| commit | 24244d03b55bc7732b3362bab1e1cc7e04c2dabf (patch) | |
| tree | b40f6adbb8a07eaa108b3ec2ff1b46b09706cea3 | |
| parent | 51ceacb1fc10e4f2adb1b1b960e9c4a4d6f111a3 (diff) | |
| download | gitlab-ce-24244d03b55bc7732b3362bab1e1cc7e04c2dabf.tar.gz | |
Revert "Merge branch 'sh-sidekiq-backtrace' into 'master'"
This reverts merge request !13813
| -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, 0 insertions, 13 deletions
diff --git a/app/workers/concerns/exception_backtrace.rb b/app/workers/concerns/exception_backtrace.rb deleted file mode 100644 index e3ecdfe2502..00000000000 --- a/app/workers/concerns/exception_backtrace.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Concern for enabling a few lines of exception backtraces in Sidekiq -module BuildQueue - 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 bd8e212e928..07e82767b06 100644 --- a/app/workers/group_destroy_worker.rb +++ b/app/workers/group_destroy_worker.rb @@ -1,7 +1,6 @@ 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 f1cd1769421..1cfb0be759e 100644 --- a/app/workers/namespaceless_project_destroy_worker.rb +++ b/app/workers/namespaceless_project_destroy_worker.rb @@ -7,7 +7,6 @@ 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 3be7e686609..a9188b78460 100644 --- a/app/workers/project_destroy_worker.rb +++ b/app/workers/project_destroy_worker.rb @@ -1,7 +1,6 @@ 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 f13ac9e5db2..6009aa1b191 100644 --- a/app/workers/project_export_worker.rb +++ b/app/workers/project_export_worker.rb @@ -1,7 +1,6 @@ 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 00a021abbdc..2c2d1e8b91f 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -3,7 +3,6 @@ class RepositoryImportWorker include Sidekiq::Worker include DedicatedSidekiqQueue - include ExceptionBacktrace sidekiq_options status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION |