don't add duplicate jobs

redmine-git-hosting · May 9, 2016 · 2c82baf · 2c82baf
1 parent 7350b47
commit 2c82baf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/workers/githosting_shell_worker.rb b/app/workers/githosting_shell_worker.rb
@@ -3,6 +3,15 @@ class GithostingShellWorker
 
   sidekiq_options queue: :redmine_git_hosting, retry: false
 
+  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
+    end
+
+    perform_async(command, object, options)
+  end
+
   def perform(command, object, options = {})
     logger.info("#{command} | #{object} | #{options}")
     RedmineGitHosting::GitoliteWrapper.resync_gitolite(command, object, options)

diff --git a/lib/redmine_git_hosting/gitolite_accessor.rb b/lib/redmine_git_hosting/gitolite_accessor.rb
@@ -140,7 +140,7 @@ def resync_gitolite(command, object, options = {})
         end
 
         if RedmineGitHosting::Config.gitolite_use_sidekiq? && !bypass
-          GithostingShellWorker.perform_async(command, object, options)
+          GithostingShellWorker.maybe_do(command, object, options)
         else
           GitoliteWrapper.resync_gitolite(command, object, options)
         end