summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-04-06 13:47:05 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-04-06 13:47:05 +0200
commit5cf56e56470e695b10db02dff70d0f0b50060518 (patch)
treed46ecd17857f8e49abda15c03576c099e2bf39df /app/workers
parente3558ed67e7e829fe5148c3fb2fe80ed045fe1b4 (diff)
downloadgitlab-ce-5cf56e56470e695b10db02dff70d0f0b50060518.tar.gz
Rename almost all the things
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/admin_email_worker.rb6
-rw-r--r--app/workers/repository_check_worker.rb (renamed from app/workers/repo_check_worker.rb)14
-rw-r--r--app/workers/single_repository_check_worker.rb (renamed from app/workers/single_repo_check_worker.rb)8
3 files changed, 14 insertions, 14 deletions
diff --git a/app/workers/admin_email_worker.rb b/app/workers/admin_email_worker.rb
index fcccb9ea669..667fff031dd 100644
--- a/app/workers/admin_email_worker.rb
+++ b/app/workers/admin_email_worker.rb
@@ -4,9 +4,9 @@ class AdminEmailWorker
sidekiq_options retry: false # this job auto-repeats via sidekiq-cron
def perform
- repo_check_failed_count = Project.where(last_repo_check_failed: true).count
- return if repo_check_failed_count.zero?
+ repository_check_failed_count = Project.where(last_repository_check_failed: true).count
+ return if repository_check_failed_count.zero?
- RepoCheckMailer.notify(repo_check_failed_count).deliver_now
+ RepositoryCheckMailer.notify(repository_check_failed_count).deliver_now
end
end
diff --git a/app/workers/repo_check_worker.rb b/app/workers/repository_check_worker.rb
index 9be795309e0..2d75c8bafde 100644
--- a/app/workers/repo_check_worker.rb
+++ b/app/workers/repository_check_worker.rb
@@ -1,4 +1,4 @@
-class RepoCheckWorker
+class RepositoryCheckWorker
include Sidekiq::Worker
RUN_TIME = 3600
@@ -11,14 +11,14 @@ class RepoCheckWorker
# This loop will break after a little more than one hour ('a little
# more' because `git fsck` may take a few minutes), or if it runs out of
# projects to check. By default sidekiq-cron will start a new
- # RepoCheckWorker each hour so that as long as there are repositories to
+ # RepositoryCheckWorker each hour so that as long as there are repositories to
# check, only one (or two) will be checked at a time.
project_ids.each do |project_id|
break if Time.now - start >= RUN_TIME
next if !try_obtain_lease(project_id)
- SingleRepoCheckWorker.new.perform(project_id)
+ SingleRepositoryCheckWorker.new.perform(project_id)
end
end
@@ -29,16 +29,16 @@ class RepoCheckWorker
# an array of IDs instead.
def project_ids
limit = 10_000
- never_checked_projects = Project.where('last_repo_check_at IS NULL').limit(limit).
+ never_checked_projects = Project.where('last_repository_check_at IS NULL').limit(limit).
pluck(:id)
- old_check_projects = Project.where('last_repo_check_at < ?', 1.week.ago).
- reorder('last_repo_check_at ASC').limit(limit).pluck(:id)
+ old_check_projects = Project.where('last_repository_check_at < ?', 1.week.ago).
+ reorder('last_repository_check_at ASC').limit(limit).pluck(:id)
never_checked_projects + old_check_projects
end
def try_obtain_lease(id)
lease = Gitlab::ExclusiveLease.new(
- "project_repo_check:#{id}",
+ "project_repository_check:#{id}",
timeout: RUN_TIME
)
lease.try_obtain
diff --git a/app/workers/single_repo_check_worker.rb b/app/workers/single_repository_check_worker.rb
index f8b245247c5..d9eed9bd708 100644
--- a/app/workers/single_repo_check_worker.rb
+++ b/app/workers/single_repository_check_worker.rb
@@ -1,4 +1,4 @@
-class SingleRepoCheckWorker
+class SingleRepositoryCheckWorker
include Sidekiq::Worker
sidekiq_options retry: false
@@ -21,14 +21,14 @@ class SingleRepoCheckWorker
output, status = Gitlab::Popen.popen(cmd)
return true if status.zero?
- Gitlab::RepoCheckLogger.error("command failed: #{cmd.join(' ')}\n#{output}")
+ Gitlab::RepositoryCheckLogger.error("command failed: #{cmd.join(' ')}\n#{output}")
false
end
def update(project, success:)
project.update_columns(
- last_repo_check_failed: !success,
- last_repo_check_at: Time.now,
+ last_repository_check_failed: !success,
+ last_repository_check_at: Time.now,
)
end
end