fix workers

Undev · Aug 28, 2014 · d33850f · d33850f
1 parent 1b9d996
commit d33850f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/app/workers/block_user_worker.rb b/app/workers/block_user_worker.rb
@@ -1,7 +1,7 @@
 class BlockUserWorker
   @queue = :common
 
-  def self.perform(user_idi, author_id)
+  def self.perform(user_id, author_id)
     author = User.find(author_id)
     user = User.find(user_id)
 

diff --git a/app/workers/ci_build_result_worker.rb b/app/workers/ci_build_result_worker.rb
@@ -1,6 +1,4 @@
 class CiBuildResultWorker
-  include Gitlab::Identifier
-
   @queue = :build_result
 
   def self.perform(data)

diff --git a/app/workers/elastic/base_indexer.rb b/app/workers/elastic/base_indexer.rb
@@ -7,7 +7,7 @@ class Elastic::BaseIndexer
                                      logger: Logger)
 
   def self.perform(operation, klass, record_id, options={})
-    logger.debug [operation, "#{klass}##{record_id} #{options.inspect}"]
+    Logger.debug [operation, "#{klass}##{record_id} #{options.inspect}"]
 
     cklass = klass.constantize
 

diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
@@ -4,7 +4,10 @@ class PostReceive
   @queue = :post_receive
 
   def self.perform(repo_path, oldrev, newrev, ref, identifier)
+    PostReceive.new.perform(repo_path, oldrev, newrev, ref, identifier)
+  end
 
+  def perform(repo_path, oldrev, newrev, ref, identifier)
     if repo_path.start_with?(Gitlab.config.gitlab_shell.repos_path.to_s)
       repo_path.gsub!(Gitlab.config.gitlab_shell.repos_path.to_s, "")
     else

diff --git a/lib/gitlab/backend/shell_adapter.rb b/lib/gitlab/backend/shell_adapter.rb
@@ -4,10 +4,6 @@
 #
 module Gitlab
   module ShellAdapter
-    def self.gitlab_shell
-      Gitlab::Shell.new
-    end
-
     def gitlab_shell
       Gitlab::Shell.new
     end