From 1860ef7dd4675cda33577bf830423697b94cc8fb Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 27 Jun 2018 10:47:30 +0100
Subject: [PATCH] Add extra logging to githost.log when rebasing

---
 app/services/merge_requests/rebase_service.rb     | 8 ++++++++
 changelogs/unreleased/add-more-rebase-logging.yml | 5 +++++
 2 files changed, 13 insertions(+)
 create mode 100644 changelogs/unreleased/add-more-rebase-logging.yml

diff --git a/app/services/merge_requests/rebase_service.rb b/app/services/merge_requests/rebase_service.rb
index c0083cd6afd..5b4bc86b9ba 100644
--- a/app/services/merge_requests/rebase_service.rb
+++ b/app/services/merge_requests/rebase_service.rb
@@ -18,10 +18,18 @@ module MergeRequests
         return false
       end
 
+      log_prefix = "#{self.class.name} info (#{merge_request.to_reference(full: true)}):"
+
+      Gitlab::GitLogger.info("#{log_prefix} rebase started")
+
       rebase_sha = repository.rebase(current_user, merge_request)
 
+      Gitlab::GitLogger.info("#{log_prefix} rebased to #{rebase_sha}")
+
       merge_request.update_attributes(rebase_commit_sha: rebase_sha)
 
+      Gitlab::GitLogger.info("#{log_prefix} rebase SHA saved: #{rebase_sha}")
+
       true
     rescue => e
       log_error(REBASE_ERROR, save_message_on_model: true)
diff --git a/changelogs/unreleased/add-more-rebase-logging.yml b/changelogs/unreleased/add-more-rebase-logging.yml
new file mode 100644
index 00000000000..a7d1c3aa664
--- /dev/null
+++ b/changelogs/unreleased/add-more-rebase-logging.yml
@@ -0,0 +1,5 @@
+---
+title: Add more detailed logging to githost.log when rebasing
+merge_request:
+author:
+type: other
-- 
GitLab