From 75b7ba3f7b89f10f7088b84b4594e747c571f016 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 18 Oct 2016 21:59:57 -0700
Subject: [PATCH] Identify merge request project and IID in log message
---
app/services/merge_requests/merge_service.rb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index 38477c1f321..ab9056a3250 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -67,9 +67,15 @@ module MergeRequests
end
def log_merge_error(message, http_error = false)
- Rails.logger.error("MergeService error: #{message}")
+ Rails.logger.error("MergeService ERROR: #{merge_request_info} - #{message}")
error(message) if http_error
end
+
+ def merge_request_info
+ project = merge_request.project
+
+ "#{project.to_reference}#{merge_request.to_reference}"
+ end
end
end
--
GitLab