Skip to content
Snippets Groups Projects
Commit 1be6c9f7 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

refactor(logs): adjust log levels for branch and pr events

parent d76ddb0c
No related branches found
No related tags found
No related merge requests found
...@@ -779,6 +779,7 @@ async function createPr( ...@@ -779,6 +779,7 @@ async function createPr(
`repos/${config.parentRepo || config.repository}/pulls`, `repos/${config.parentRepo || config.repository}/pulls`,
options options
)).body; )).body;
logger.info({ branchName, pr: pr.number }, 'PR created');
pr.displayNumber = `Pull Request #${pr.number}`; pr.displayNumber = `Pull Request #${pr.number}`;
pr.branchName = branchName; pr.branchName = branchName;
await addLabels(pr.number, labels); await addLabels(pr.number, labels);
...@@ -912,6 +913,7 @@ async function updatePr(prNo, title, body) { ...@@ -912,6 +913,7 @@ async function updatePr(prNo, title, body) {
`repos/${config.parentRepo || config.repository}/pulls/${prNo}`, `repos/${config.parentRepo || config.repository}/pulls/${prNo}`,
options options
); );
logger.info({ pr: prNo }, 'PR updated');
} }
async function mergePr(prNo, branchName) { async function mergePr(prNo, branchName) {
...@@ -997,13 +999,13 @@ async function mergePr(prNo, branchName) { ...@@ -997,13 +999,13 @@ async function mergePr(prNo, branchName) {
{ err: err3 }, { err: err3 },
`Failed to ${options.body.merge_method} PR` `Failed to ${options.body.merge_method} PR`
); );
logger.info({ pr: prNo }, 'All merge attempts failed'); logger.debug({ pr: prNo }, 'All merge attempts failed');
return false; return false;
} }
} }
} }
} }
logger.info('Automerging succeeded'); logger.info({ pr: prNo }, 'PR merged');
// Update base branch SHA // Update base branch SHA
config.baseCommitSHA = null; config.baseCommitSHA = null;
// Delete branch // Delete branch
......
...@@ -181,6 +181,7 @@ class Storage { ...@@ -181,6 +181,7 @@ class Storage {
}; };
try { try {
await get.patch(url, options); await get.patch(url, options);
logger.info({ branchName }, 'Branch merged');
} catch (err) { } catch (err) {
logger.info( logger.info(
expandError(err), expandError(err),
...@@ -297,8 +298,10 @@ class Storage { ...@@ -297,8 +298,10 @@ class Storage {
try { try {
if (isBranchExisting) { if (isBranchExisting) {
await updateBranch(branchName, commit); await updateBranch(branchName, commit);
logger.info({ branchName }, 'Branch updated');
} else { } else {
await createBranch(branchName, commit); await createBranch(branchName, commit);
logger.info({ branchName }, 'Branch created');
} }
} catch (err) /* istanbul ignore next */ { } catch (err) /* istanbul ignore next */ {
logger.debug({ logger.debug({
......
...@@ -16,7 +16,7 @@ async function tryBranchAutomerge(config) { ...@@ -16,7 +16,7 @@ async function tryBranchAutomerge(config) {
config.requiredStatusChecks config.requiredStatusChecks
); );
if (branchStatus === 'success') { if (branchStatus === 'success') {
logger.info(`Automerging branch`); logger.debug(`Automerging branch`);
try { try {
await platform.mergeBranch(config.branchName); await platform.mergeBranch(config.branchName);
return 'automerged'; // Branch no longer exists return 'automerged'; // Branch no longer exists
......
...@@ -240,7 +240,7 @@ async function ensurePr(prConfig) { ...@@ -240,7 +240,7 @@ async function ensurePr(prConfig) {
logger.info({ pr: existingPr.displayNumber }, `Updated PR`); logger.info({ pr: existingPr.displayNumber }, `Updated PR`);
return existingPr; return existingPr;
} }
logger.info({ branchName, prTitle }, `Creating PR`); logger.debug({ branchName, prTitle }, `Creating PR`);
// istanbul ignore if // istanbul ignore if
if (config.updateType === 'rollback') { if (config.updateType === 'rollback') {
logger.warn('Creating Rollback PR'); logger.warn('Creating Rollback PR');
...@@ -387,7 +387,7 @@ async function checkAutoMerge(pr, config) { ...@@ -387,7 +387,7 @@ async function checkAutoMerge(pr, config) {
return platform.ensureComment(pr.number, null, automergeComment); return platform.ensureComment(pr.number, null, automergeComment);
} }
// Let's merge this // Let's merge this
logger.info(`Automerging #${pr.number}`); logger.debug(`Automerging #${pr.number}`);
return platform.mergePr(pr.number, branchName); return platform.mergePr(pr.number, branchName);
} }
logger.debug('No automerge'); logger.debug('No automerge');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment