#800 fix async job problem with arguments

redmine-git-hosting · Oct 21, 2021 · 89401e8 · 89401e8
1 parent 8ae7a10
commit 89401e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/workers/githosting_shell_worker.rb b/app/workers/githosting_shell_worker.rb
@@ -5,16 +5,16 @@ class GithostingShellWorker
 
   sidekiq_options queue: :redmine_git_hosting, retry: false
 
-  def self.maybe_do(command, object, **options)
+  def self.maybe_do(command, object, options)
     args = [command.to_s, object, options]
     Sidekiq::Queue.new(:redmine_git_hosting).each do |job|
-      return if job.args == args
+      return nil if job.args == args
     end
 
     perform_async command, object, options
   end
 
-  def perform(command, object, **options)
+  def perform(command, object, options)
     logger.info "#{command} | #{object} | #{options}"
     RedmineGitHosting::GitoliteWrapper.resync_gitolite command, object, options
   end

diff --git a/lib/redmine_git_hosting/gitolite_accessor.rb b/lib/redmine_git_hosting/gitolite_accessor.rb
@@ -116,9 +116,9 @@ def resync_gitolite(command, object, **options)
 
       if RedmineGitHosting::Config.gitolite_use_sidekiq? &&
          RedmineGitHosting::Config.sidekiq_available? && !bypass
-        GithostingShellWorker.maybe_do command, object, **options
+        GithostingShellWorker.maybe_do command, object, options
       else
-        GitoliteWrapper.resync_gitolite command, object, **options
+        GitoliteWrapper.resync_gitolite command, object, options
       end
     end
   end