Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cfb62a4c
Commit
cfb62a4c
authored
May 12, 2017
by
Douglas Barbosa Alexandre
Committed by
Robert Speicher
May 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make cron job name consistent with GeoFileDownloadDispatchWorker
parent
d702e3e9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
10 deletions
+7
-10
config/gitlab.yml.example
config/gitlab.yml.example
+2
-2
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+3
-3
lib/gitlab/geo.rb
lib/gitlab/geo.rb
+1
-1
spec/lib/gitlab/geo_spec.rb
spec/lib/gitlab/geo_spec.rb
+1
-4
No files found.
config/gitlab.yml.example
View file @
cfb62a4c
...
...
@@ -221,9 +221,9 @@ production: &base
geo_repository_sync_worker:
cron: "*/5 * * * *"
# GitLab Geo file download worker
# GitLab Geo file download
dispatch
worker
# NOTE: This will only take effect if Geo is enabled
geo_download_dispatch_worker:
geo_
file_
download_dispatch_worker:
cron: "*/10 * * * *"
registry:
...
...
config/initializers/1_settings.rb
View file @
cfb62a4c
...
...
@@ -399,9 +399,9 @@ Settings.cron_jobs['geo_bulk_notify_worker']['job_class'] ||= 'GeoBulkNotifyWork
Settings
.
cron_jobs
[
'geo_repository_sync_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'geo_repository_sync_worker'
][
'cron'
]
||=
'*/5 * * * *'
Settings
.
cron_jobs
[
'geo_repository_sync_worker'
][
'job_class'
]
||=
'GeoRepositorySyncWorker'
Settings
.
cron_jobs
[
'geo_download_dispatch_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'geo_download_dispatch_worker'
][
'cron'
]
||=
'5 * * * *'
Settings
.
cron_jobs
[
'geo_download_dispatch_worker'
][
'job_class'
]
||=
'GeoFileDownloadDispatchWorker'
Settings
.
cron_jobs
[
'geo_
file_
download_dispatch_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'geo_
file_
download_dispatch_worker'
][
'cron'
]
||=
'5 * * * *'
Settings
.
cron_jobs
[
'geo_
file_
download_dispatch_worker'
][
'job_class'
]
||=
'GeoFileDownloadDispatchWorker'
Settings
.
cron_jobs
[
'gitlab_usage_ping_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'gitlab_usage_ping_worker'
][
'cron'
]
||=
Settings
.
send
(
:cron_random_weekly_time
)
Settings
.
cron_jobs
[
'gitlab_usage_ping_worker'
][
'job_class'
]
=
'GitlabUsagePingWorker'
...
...
lib/gitlab/geo.rb
View file @
cfb62a4c
...
...
@@ -79,7 +79,7 @@ module Gitlab
end
def
self
.
file_download_job
Sidekiq
::
Cron
::
Job
.
find
(
'geo_download_dispatch_worker'
)
Sidekiq
::
Cron
::
Job
.
find
(
'geo_
file_
download_dispatch_worker'
)
end
def
self
.
configure_primary_jobs!
...
...
spec/lib/gitlab/geo_spec.rb
View file @
cfb62a4c
...
...
@@ -122,11 +122,8 @@ describe Gitlab::Geo, lib: true do
end
before
(
:all
)
do
jobs
=
%w(geo_bulk_notify_worker geo_repository_sync_worker)
jobs
=
%w(geo_bulk_notify_worker geo_repository_sync_worker geo_file_download_dispatch_worker)
jobs
.
each
{
|
job
|
init_cron_job
(
job
,
job
.
camelize
)
}
# TODO: Make this name consistent
init_cron_job
(
'geo_download_dispatch_worker'
,
'GeoFileDownloadDispatchWorker'
)
end
it
'activates cron jobs for primary'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment