summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-10-18 21:59:57 -0700
committerStan Hu <stanhu@gmail.com>2016-10-18 22:01:42 -0700
commit75b7ba3f7b89f10f7088b84b4594e747c571f016 (patch)
treeaa069b86a42060ddca05143894b393cacc5de7ff
parent47b0edbe746d5ca2a1502d3f0bf0213fe1789567 (diff)
downloadgitlab-ce-sh-improve-merge-service-logging.tar.gz
Identify merge request project and IID in log messagesh-improve-merge-service-logging
-rw-r--r--app/services/merge_requests/merge_service.rb8
1 files changed, 7 insertions, 1 deletions
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