From 8eb3a037ee45a179a20f8bbcefb2effc8d4231f1 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 14 Oct 2020 08:49:56 +0200
Subject: [PATCH] fix: correct autoclose logging
---
lib/workers/repository/finalise/prune.ts | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/workers/repository/finalise/prune.ts b/lib/workers/repository/finalise/prune.ts
index 1434f1e895..f7ba769c07 100644
--- a/lib/workers/repository/finalise/prune.ts
+++ b/lib/workers/repository/finalise/prune.ts
@@ -31,6 +31,10 @@ async function cleanUpBranches(
`PRUNING-DISABLED: Would update pr ${pr.number} to ${pr.title} - autoclosed`
);
} else {
+ logger.info(
+ { branchName, prNo: pr.number, prTitle: pr.title },
+ 'Autoclosing PR'
+ );
await platform.updatePr({
number: pr.number,
prTitle: `${pr.title} - autoclosed`,
@@ -40,8 +44,11 @@ async function cleanUpBranches(
}
}
- logger.debug({ branch: branchName }, `Deleting orphan branch`);
if (branchIsModified) {
+ logger.debug(
+ { branch: branchName },
+ `Skipping orphan branch deletion as branch has been modified`
+ );
if (pr) {
logger.debug(
{ prNo: pr?.number, prTitle: pr?.title },
@@ -65,11 +72,9 @@ async function cleanUpBranches(
`PRUNING-DISABLED: Would deleting orphan branch ${branchName}`
);
} else {
+ logger.debug({ branch: branchName }, `Deleting orphan branch`);
await deleteBranch(branchName);
}
- if (pr && !branchIsModified) {
- logger.info({ prNo: pr.number, prTitle: pr.title }, 'PR autoclosed');
- }
} catch (err) /* istanbul ignore next */ {
if (err.message !== REPOSITORY_CHANGED) {
logger.warn({ err, branch: branchName }, 'Error pruning branch');
--
GitLab