diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 21:09:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 21:09:44 +0300 |
| commit | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (patch) | |
| tree | 115fa8dbf6bc05037378b380311d31acb805f54c /lib/tasks | |
| parent | 8e129497b2565b8c595ef4f806d9a9595ca654e5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/import_export/export.rake | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/import_export/import.rake | 1 | ||||
| -rw-r--r-- | lib/tasks/sidekiq.rake | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/lib/tasks/gitlab/import_export/export.rake b/lib/tasks/gitlab/import_export/export.rake index ae54636fdd3..c9c212fbe4d 100644 --- a/lib/tasks/gitlab/import_export/export.rake +++ b/lib/tasks/gitlab/import_export/export.rake @@ -19,7 +19,6 @@ namespace :gitlab do if ENV['EXPORT_DEBUG'].present? ActiveRecord::Base.logger = logger - Gitlab::Metrics::Exporter::SidekiqExporter.instance.start logger.level = Logger::DEBUG else logger.level = Logger::INFO diff --git a/lib/tasks/gitlab/import_export/import.rake b/lib/tasks/gitlab/import_export/import.rake index 6e2d0e75da8..7e2162a7774 100644 --- a/lib/tasks/gitlab/import_export/import.rake +++ b/lib/tasks/gitlab/import_export/import.rake @@ -23,7 +23,6 @@ namespace :gitlab do if ENV['IMPORT_DEBUG'].present? ActiveRecord::Base.logger = logger - Gitlab::Metrics::Exporter::SidekiqExporter.instance.start logger.level = Logger::DEBUG else logger.level = Logger::INFO diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake index e281ebd5d60..d74878835fd 100644 --- a/lib/tasks/sidekiq.rake +++ b/lib/tasks/sidekiq.rake @@ -33,6 +33,6 @@ namespace :sidekiq do task :launchd do deprecation_warning! - system(*%w(bin/background_jobs start_no_deamonize)) + system(*%w(bin/background_jobs start_silent)) end end |