diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-16 12:49:01 -0200 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-16 13:38:47 -0200 |
commit | 011558ea4ac59bce74c18d2f7c55ac257de111c6 (patch) | |
tree | a9fae365b694ff1b245bd7994a69341cb049fd66 /app/services/merge_requests | |
parent | 304ceb144cca36dbcefcfb508b0dac220f76c9e1 (diff) | |
download | gitlab-ce-011558ea4ac59bce74c18d2f7c55ac257de111c6.tar.gz |
Add logs for monitoring the merge processosw-merge-process-logs
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r-- | app/services/merge_requests/merge_service.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 156e7b2f078..ac96182e473 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -10,6 +10,8 @@ module MergeRequests attr_reader :merge_request, :source + delegate :merge_jid, :state, to: :@merge_request + def execute(merge_request) if project.merge_requests_ff_only_enabled && !self.is_a?(FfMergeService) FfMergeService.new(project, current_user, params).execute(merge_request) @@ -35,6 +37,7 @@ module MergeRequests success end end + log_info("Merge process finished on JID #{merge_jid} with state #{state}") rescue MergeError => e handle_merge_error(log_message: e.message, save_message_on_model: true) end @@ -44,7 +47,9 @@ module MergeRequests def commit message = params[:commit_message] || merge_request.merge_commit_message + log_info("Git merge started on JID #{merge_jid}") commit_id = repository.merge(current_user, source, merge_request, message) + log_info("Git merge finished on JID #{merge_jid} commit #{commit_id}") raise MergeError, 'Conflicts detected during merge' unless commit_id @@ -58,7 +63,9 @@ module MergeRequests end def after_merge + log_info("Post merge started on JID #{merge_jid} with state #{state}") MergeRequests::PostMergeService.new(project, current_user).execute(merge_request) + log_info("Post merge finished on JID #{merge_jid} with state #{state}") if delete_source_branch? DeleteBranchService.new(@merge_request.source_project, branch_deletion_user) @@ -94,5 +101,10 @@ module MergeRequests def find_merge_source merge_request.diff_head_sha end + + def log_info(message) + @logger ||= Rails.logger + @logger.info(message) + end end end |