From cc029c28913dbd0d25cf167f12a4925287ead87a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 14 Oct 2019 09:25:21 +0200 Subject: [PATCH] [IMP] runbot_merge: add some logging to controllers The closing or reopening of PRs was not logged at all, which can be inconvenient when trying to find out why PRs are closed (or not) in the backend. Also leverage PR display_name improvements from 3ce3dd95694cd9eb11963df1d900627ae33bc944 for more regular PR names in logs. --- runbot_merge/controllers/__init__.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/runbot_merge/controllers/__init__.py b/runbot_merge/controllers/__init__.py index d2a6357e..b077f777 100644 --- a/runbot_merge/controllers/__init__.py +++ b/runbot_merge/controllers/__init__.py @@ -142,14 +142,14 @@ def handle_pr(env, event): if pr_obj.state == 'ready': pr_obj.unstage( - "PR %s:%s updated by %s", - pr_obj.repository.name, pr_obj.number, + "PR %s updated by %s", + pr_obj.display_name, event['sender']['login'] ) _logger.info( - "PR %s:%s updated to %s by %s, resetting to 'open' and squash=%s", - pr_obj.repository.name, pr_obj.number, + "PR %s updated to %s by %s, resetting to 'open' and squash=%s", + pr_obj.display_name, pr['head']['sha'], event['sender']['login'], pr['commits'] == 1 ) @@ -164,12 +164,19 @@ def handle_pr(env, event): # don't marked merged PRs as closed (!!!) if event['action'] == 'closed' and pr_obj.state != 'merged': # FIXME: store some sort of "try to close it later" if the merge fails? + _logger.info( + '%s closing %s (state=%s)', + event['sender']['login'], + pr_obj.display_name, + pr_obj.state, + ) if pr_obj._try_closing(event['sender']['login']): return 'Closed {}'.format(pr_obj.id) else: return 'Ignored: could not lock rows (probably being merged)' if event['action'] == 'reopened' and pr_obj.state == 'closed': + _logger.info('%s reopening %s', event['sender']['login'], pr_obj.display_name) pr_obj.write({ 'state': 'opened', # updating the head triggers a revalidation