File tree 2 files changed +10
-4
lines changed
2 files changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,13 @@ def initialize(command, output)
30
30
31
31
32
32
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
34
40
GithostingShellWorker . perform_async ( command , object , options )
35
41
else
36
42
RedmineGitolite ::GitoliteWrapper . update ( command , object , options )
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ namespace :redmine_git_hosting do
9
9
10
10
GitolitePublicKey . all . each do |ssh_key |
11
11
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 )
13
13
ssh_key . reset_identifiers
14
14
end
15
15
puts ""
@@ -19,13 +19,13 @@ namespace :redmine_git_hosting do
19
19
20
20
GitolitePublicKey . all . each do |ssh_key |
21
21
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 )
23
23
end
24
24
25
25
puts ""
26
26
27
27
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 )
29
29
30
30
puts "Done!"
31
31
end
You can’t perform that action at this time.
0 commit comments