Commit a1704273 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Refactor post-receive worker

parent 348eb125
class PostReceive class PostReceive
include Sidekiq::Worker include Sidekiq::Worker
include Gitlab::Identifier
sidekiq_options queue: :post_receive sidekiq_options queue: :post_receive
...@@ -8,7 +9,7 @@ class PostReceive ...@@ -8,7 +9,7 @@ class PostReceive
if repo_path.start_with?(Gitlab.config.gitlab_shell.repos_path.to_s) if repo_path.start_with?(Gitlab.config.gitlab_shell.repos_path.to_s)
repo_path.gsub!(Gitlab.config.gitlab_shell.repos_path.to_s, "") repo_path.gsub!(Gitlab.config.gitlab_shell.repos_path.to_s, "")
else else
Gitlab::GitLogger.error("POST-RECEIVE: Check gitlab.yml config for correct gitlab_shell.repos_path variable. \"#{Gitlab.config.gitlab_shell.repos_path}\" does not match \"#{repo_path}\"") log("Check gitlab.yml config for correct gitlab_shell.repos_path variable. \"#{Gitlab.config.gitlab_shell.repos_path}\" does not match \"#{repo_path}\"")
end end
repo_path.gsub!(/.git$/, "") repo_path.gsub!(/.git$/, "")
...@@ -17,31 +18,21 @@ class PostReceive ...@@ -17,31 +18,21 @@ class PostReceive
project = Project.find_with_namespace(repo_path) project = Project.find_with_namespace(repo_path)
if project.nil? if project.nil?
Gitlab::GitLogger.error("POST-RECEIVE: Triggered hook for non-existing project with full path \"#{repo_path} \"") log("Triggered hook for non-existing project with full path \"#{repo_path} \"")
return false return false
end end
user = if identifier.blank? user = identify(identifier, project, newrev)
# Local push from gitlab
email = project.repository.commit(newrev).author_email rescue nil
User.find_by_email(email) if email
elsif identifier =~ /\Auser-\d+\Z/
# git push over http
user_id = identifier.gsub("user-", "")
User.find_by_id(user_id)
elsif identifier =~ /\Akey-\d+\Z/
# git push over ssh
key_id = identifier.gsub("key-", "")
Key.find_by_id(key_id).try(:user)
end
unless user unless user
Gitlab::GitLogger.error("POST-RECEIVE: Triggered hook for non-existing user \"#{identifier} \"") log("Triggered hook for non-existing user \"#{identifier} \"")
return false return false
end end
GitPushService.new.execute(project, user, oldrev, newrev, ref) GitPushService.new.execute(project, user, oldrev, newrev, ref)
end end
def log(message)
Gitlab::GitLogger.error("POST-RECEIVE: #{message}")
end
end end
# Detect user based on identifier like
# key-13 or user-36 or last commit
module Gitlab
module Indentifier
def identify(identifier, project, newrev)
if identifier.blank?
# Local push from gitlab
email = project.repository.commit(newrev).author_email rescue nil
User.find_by_email(email) if email
elsif identifier =~ /\Auser-\d+\Z/
# git push over http
user_id = identifier.gsub("user-", "")
User.find_by_id(user_id)
elsif identifier =~ /\Akey-\d+\Z/
# git push over ssh
key_id = identifier.gsub("key-", "")
Key.find_by_id(key_id).try(:user)
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment