Advanced logging for post-receive worker

1 files changed, 12 insertions, 2 deletions

diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index a906f78f7e3..6d31c08fefc 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -4,12 +4,22 @@ class PostReceive
   sidekiq_options queue: :post_receive
 
   def perform(repo_path, oldrev, newrev, ref, identifier)
-    repo_path.gsub!(Gitlab.config.gitolite.repos_path.to_s, "")
+
+    if repo_path.start_with?(Gitlab.config.gitolite.repos_path.to_s)
+      repo_path.gsub!(Gitlab.config.gitolite.repos_path.to_s, "")
+    else
+      Gitlab::GitLogger.error("POST-RECEIVE: Check gitlab.yml config for correct gitolite.repos_path variable. \"#{Gitlab.config.gitolite.repos_path}\" does not match \"#{repo_path}\"")
+    end
+
     repo_path.gsub!(/.git$/, "")
     repo_path.gsub!(/^\//, "")
 
     project = Project.find_with_namespace(repo_path)
-    return false if project.nil?
+
+    if project.nil?
+      Gitlab::GitLogger.error("POST-RECEIVE: Triggered hook for non-existing project with full path \"#{repo_path} \"")
+      return false
+    end
 
     # Ignore push from non-gitlab users
     user = if identifier.eql? Gitlab.config.gitolite.admin_key