Skip to content

Refactor merge service logging again

Stan Hu requested to merge sh-merge-request-service-logging-part2 into master

This commit moves some the common logic for logging information and error messages into MergeRequests::BaseService and standardizes the fields used in the log message. This was needed because log_error was implemented in both MergeRequests::BaseService and accidentally overridden in MergeRequests::MergeService in !100381 (merged).

In addition, this moves a merge error message from application_json.log to git_json.log to be consistent with the other merge services.

This is done in preparation of adding a retry for critical database updates.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Stan Hu

Merge request reports