Sidekiq-cron configuration moved to gitlab.yml
This commit is contained in:
parent
a5e449571b
commit
51ef4a2fed
|
@ -144,6 +144,15 @@ production: &base
|
||||||
# plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
|
# plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
|
||||||
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
|
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
|
||||||
|
|
||||||
|
## Auxiliary jobs
|
||||||
|
# Periodically executed jobs, to self-heal Gitlab, do external synchronizations, etc.
|
||||||
|
# Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
|
||||||
|
cron_jobs:
|
||||||
|
# Flag stuck CI builds as failed
|
||||||
|
stuck_ci_builds_worker:
|
||||||
|
cron: "0 0 * * *"
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# 2. GitLab CI settings
|
# 2. GitLab CI settings
|
||||||
# ==========================
|
# ==========================
|
||||||
|
|
|
@ -224,6 +224,15 @@ Settings.gravatar['plain_url'] ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{
|
||||||
Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
|
Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
|
||||||
Settings.gravatar['host'] = Settings.get_host_without_www(Settings.gravatar['plain_url'])
|
Settings.gravatar['host'] = Settings.get_host_without_www(Settings.gravatar['plain_url'])
|
||||||
|
|
||||||
|
#
|
||||||
|
# Cron Jobs
|
||||||
|
#
|
||||||
|
Settings['cron_jobs'] ||= Settingslogic.new({})
|
||||||
|
Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({})
|
||||||
|
Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 0 * * *'
|
||||||
|
Settings.cron_jobs['stuck_ci_builds_worker']['class'] = 'StuckCiBuildsWorker'
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# GitLab Shell
|
# GitLab Shell
|
||||||
#
|
#
|
||||||
|
|
|
@ -18,11 +18,8 @@ Sidekiq.configure_server do |config|
|
||||||
chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS']
|
chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS']
|
||||||
end
|
end
|
||||||
|
|
||||||
# Sidekiq-cron: load recurring jobs from schedule.yml
|
# Sidekiq-cron: load recurring jobs from gitlab.yml
|
||||||
schedule_file = 'config/schedule.yml'
|
Sidekiq::Cron::Job.load_from_hash! Gitlab.config.cron_jobs
|
||||||
if File.exists?(schedule_file)
|
|
||||||
Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Database pool should be at least `sidekiq_concurrency` + 2
|
# Database pool should be at least `sidekiq_concurrency` + 2
|
||||||
# For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md
|
# For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
# Here is a list of jobs that are scheduled to run periodically.
|
|
||||||
# We use a UNIX cron notation to specify execution schedule.
|
|
||||||
#
|
|
||||||
# Please read here for more information:
|
|
||||||
# https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
|
|
||||||
|
|
||||||
stuck_ci_builds_worker:
|
|
||||||
cron: "0 0 * * *"
|
|
||||||
class: "StuckCiBuildsWorker"
|
|
||||||
queue: "default"
|
|
Loading…
Reference in New Issue