Skip to content

Commit 35e7041

Browse files
authored
Merge pull request #558 from keymanapp/fix/resilience-for-tc-data
chore: more logging
2 parents f759157 + 1705a73 commit 35e7041

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

server/keymanapp-test-bot/artifact-links-comment.ts

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,29 +106,32 @@ export async function getArtifactLinksComment(
106106
const { buildTypeId, buildId } = getTeamcityUrlParams(u);
107107
console.log(`[@keymanapp-test-bot] Finding TeamCity build data for build ${buildTypeId}:${buildId}`)
108108

109+
version = null;
109110
buildData = findBuildData(s, buildTypeId, teamCityData);
110111

111112
if(buildData) version = findBuildVersion(buildData);
112113
if(version) version = /^(\d+\.\d+\.\d+)/.exec(version)?.[1];
113114
if(!version) {
114-
if(teamCityDataFromCache) {
115-
// retry reload, but only once
116-
console.log(`[@keymanapp-test-bot] Attempting reload of TeamCity data instead of using cache`);
117-
teamCityDataFromCache = false;
118-
teamCityData = (await teamcityService.get())[0];
119-
buildData = findBuildData(s, buildTypeId, teamCityData);
120-
121-
if(buildData) version = findBuildVersion(buildData);
122-
if(version) version = /^(\d+\.\d+\.\d+)/.exec(version)?.[1];
115+
console.error(`[@keymanapp-test-bot] Failed to find version information for artifact links for ${buildTypeId}:${buildId}; buildData: ${JSON.stringify(buildData)}; teamCityData.length:${JSON.stringify(teamCityData).length}`);
116+
if(!teamCityDataFromCache) {
117+
continue;
123118
}
119+
120+
// retry reload, but only once, in case our cache is out of date
121+
console.log(`[@keymanapp-test-bot] Attempting reload of TeamCity data instead of using cache for ${buildTypeId}:${buildId}`);
122+
teamCityDataFromCache = false;
123+
teamCityData = (await teamcityService.get())[0];
124+
buildData = findBuildData(s, buildTypeId, teamCityData);
125+
126+
if(buildData) version = findBuildVersion(buildData);
127+
if(version) version = /^(\d+\.\d+\.\d+)/.exec(version)?.[1];
124128
if(!version) {
125-
console.error(`[@keymanapp-test-bot] Failed to find version information for artifact links; buildData: ${JSON.stringify(buildData)}`);
129+
console.error(`[@keymanapp-test-bot] After reload, failed to find version information for artifact links for ${buildTypeId}:${buildId}; buildData: ${JSON.stringify(buildData)}`);
126130
continue;
127131
}
128132
}
129-
if(version) {
130-
console.log(`[@keymanapp-test-bot] Found version data for ${buildTypeId}:${buildId}:${version}`)
131-
}
133+
134+
console.log(`[@keymanapp-test-bot] Found version data for ${buildTypeId}:${buildId}:${version}`)
132135

133136
let t = artifactLinks.teamCityTargets[buildTypeId];
134137
if(t) {

0 commit comments

Comments
 (0)