Skip to content

Commit 414ce9a

Browse files
author
root
committed
Add option to bypass Sidekiq worker in Rake tasks
1 parent 53f42ef commit 414ce9a

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Diff for: lib/redmine_gitolite/git_hosting.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ def initialize(command, output)
3030

3131

3232
def self.resync_gitolite(command, object, options = {})
33-
if RedmineGitolite::Config.get_setting(:gitolite_use_sidekiq)
33+
if options.has_key?(:bypass_sidekiq) && options[:bypass_sidekiq] == true
34+
bypass = true
35+
else
36+
bypass = false
37+
end
38+
39+
if RedmineGitolite::Config.get_setting(:gitolite_use_sidekiq) && !bypass
3440
GithostingShellWorker.perform_async(command, object, options)
3541
else
3642
RedmineGitolite::GitoliteWrapper.update(command, object, options)

Diff for: lib/tasks/rename_ssh_keys.rake

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace :redmine_git_hosting do
99

1010
GitolitePublicKey.all.each do |ssh_key|
1111
puts " - Delete SSH key #{ssh_key.identifier}"
12-
RedmineGitolite::GitHosting.resync_gitolite(:delete_ssh_key, ssh_key.to_yaml)
12+
RedmineGitolite::GitHosting.resync_gitolite(:delete_ssh_key, ssh_key.to_yaml, bypass_sidekiq: true)
1313
ssh_key.reset_identifiers
1414
end
1515
puts ""
@@ -19,13 +19,13 @@ namespace :redmine_git_hosting do
1919

2020
GitolitePublicKey.all.each do |ssh_key|
2121
puts " - Add SSH key : #{ssh_key.identifier}"
22-
RedmineGitolite::GitHosting.resync_gitolite(:add_ssh_key, ssh_key.id)
22+
RedmineGitolite::GitHosting.resync_gitolite(:add_ssh_key, ssh_key.id, bypass_sidekiq: true)
2323
end
2424

2525
puts ""
2626

2727
RedmineGitolite::GitHosting.logger.info "Gitolite configuration has been modified, resync all projects..."
28-
RedmineGitolite::GitHosting.resync_gitolite(:update_projects, 'all')
28+
RedmineGitolite::GitHosting.resync_gitolite(:update_projects, 'all', bypass_sidekiq: true)
2929

3030
puts "Done!"
3131
end

0 commit comments

Comments
 (0)