diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2017-03-03 00:43:39 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2017-03-03 00:43:39 +0100 |
| commit | 4d4e99a2f163408de44d39ea98131a4231667c24 (patch) | |
| tree | 0b3544b81e50abefb5f6fc6607901484f708a1f4 /config | |
| parent | b66fe22a09d3969cd44c7eadab67eee8370fb998 (diff) | |
| download | gitlab-ce-4d4e99a2f163408de44d39ea98131a4231667c24.tar.gz | |
Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performant
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index b4f47b30622..8f99a4d541f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -177,8 +177,8 @@ production: &base # 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: + # Flag stuck CI jobs as failed + stuck_ci_jobs_worker: cron: "0 * * * *" # Remove expired build artifacts expire_build_artifacts_worker: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 3ec57c5bb52..5aeaa7eab81 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -308,9 +308,9 @@ Settings.gravatar['host'] = Settings.host_without_www(Settings.gravatar[ # 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 * * * *' -Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker' +Settings.cron_jobs['stuck_ci_jobs_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['stuck_ci_jobs_worker']['cron'] ||= '0 * * * *' +Settings.cron_jobs['stuck_ci_jobs_worker']['job_class'] = 'StuckCiJobsWorker' Settings.cron_jobs['expire_build_artifacts_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['expire_build_artifacts_worker']['cron'] ||= '50 * * * *' Settings.cron_jobs['expire_build_artifacts_worker']['job_class'] = 'ExpireBuildArtifactsWorker' |