logging improvement
parent
1a2ce49f9c
commit
8145561ef3
|
|
@ -1253,7 +1253,7 @@ class AWSBuildRunner {
|
||||||
core.setFailed(error);
|
core.setFailed(error);
|
||||||
core.error(error);
|
core.error(error);
|
||||||
}
|
}
|
||||||
core.info(`Cloud runner job is running on worker cluster`);
|
core.info(`Cloud runner job is running`);
|
||||||
yield this.streamLogsUntilTaskStops(ECS, CF, taskDef, cluster, taskArn, streamName);
|
yield this.streamLogsUntilTaskStops(ECS, CF, taskDef, cluster, taskArn, streamName);
|
||||||
yield ECS.waitFor('tasksStopped', { cluster, tasks: [taskArn] }).promise();
|
yield ECS.waitFor('tasksStopped', { cluster, tasks: [taskArn] }).promise();
|
||||||
const exitCode = (_s = (_r = (yield ECS.describeTasks({
|
const exitCode = (_s = (_r = (yield ECS.describeTasks({
|
||||||
|
|
@ -1268,7 +1268,7 @@ class AWSBuildRunner {
|
||||||
throw new Error(`job failed with exit code ${exitCode}`);
|
throw new Error(`job failed with exit code ${exitCode}`);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
core.info(`Task has finished successfully`);
|
core.info(`Cloud runner job has finished successfully`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -1298,7 +1298,7 @@ class AWSBuildRunner {
|
||||||
})
|
})
|
||||||
.promise()).ShardIterator || '';
|
.promise()).ShardIterator || '';
|
||||||
yield CF.waitFor('stackCreateComplete', { StackName: taskDef.taskDefStackNameTTL }).promise();
|
yield CF.waitFor('stackCreateComplete', { StackName: taskDef.taskDefStackNameTTL }).promise();
|
||||||
core.info(`Task status is ${(_a = (yield getTaskData())) === null || _a === void 0 ? void 0 : _a.lastStatus}`);
|
core.info(`Cloud runner job status is ${(_a = (yield getTaskData())) === null || _a === void 0 ? void 0 : _a.lastStatus}`);
|
||||||
const logBaseUrl = `https://${AWS.config.region}.console.aws.amazon.com/cloudwatch/home?region=${AWS.config.region}#logsV2:log-groups/log-group/${taskDef.taskDefStackName}`;
|
const logBaseUrl = `https://${AWS.config.region}.console.aws.amazon.com/cloudwatch/home?region=${AWS.config.region}#logsV2:log-groups/log-group/${taskDef.taskDefStackName}`;
|
||||||
core.info(`You can also see the logs at AWS Cloud Watch: ${logBaseUrl}`);
|
core.info(`You can also see the logs at AWS Cloud Watch: ${logBaseUrl}`);
|
||||||
let readingLogs = true;
|
let readingLogs = true;
|
||||||
|
|
@ -1308,11 +1308,11 @@ class AWSBuildRunner {
|
||||||
const taskData = yield getTaskData();
|
const taskData = yield getTaskData();
|
||||||
if ((taskData === null || taskData === void 0 ? void 0 : taskData.lastStatus) !== 'RUNNING') {
|
if ((taskData === null || taskData === void 0 ? void 0 : taskData.lastStatus) !== 'RUNNING') {
|
||||||
if (timestamp === 0) {
|
if (timestamp === 0) {
|
||||||
core.info('Task stopped, streaming end of logs');
|
core.info('Cloud runner job stopped, streaming end of logs');
|
||||||
timestamp = Date.now();
|
timestamp = Date.now();
|
||||||
}
|
}
|
||||||
if (timestamp !== 0 && Date.now() - timestamp < 30000) {
|
if (timestamp !== 0 && Date.now() - timestamp < 30000) {
|
||||||
core.info('Task status is not RUNNING for 30 seconds, last query for logs');
|
core.info('Cloud runner status is not RUNNING for 30 seconds, last query for logs');
|
||||||
readingLogs = false;
|
readingLogs = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1328,7 +1328,7 @@ class AWSBuildRunner {
|
||||||
if (json.messageType === 'DATA_MESSAGE') {
|
if (json.messageType === 'DATA_MESSAGE') {
|
||||||
for (let logEventsIndex = 0; logEventsIndex < json.logEvents.length; logEventsIndex++) {
|
for (let logEventsIndex = 0; logEventsIndex < json.logEvents.length; logEventsIndex++) {
|
||||||
if (json.logEvents[logEventsIndex].message.includes(taskDef.logid)) {
|
if (json.logEvents[logEventsIndex].message.includes(taskDef.logid)) {
|
||||||
core.info('End of task logs');
|
core.info('End of cloud runner job logs');
|
||||||
readingLogs = false;
|
readingLogs = false;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -63,7 +63,7 @@ class AWSBuildRunner {
|
||||||
core.setFailed(error);
|
core.setFailed(error);
|
||||||
core.error(error);
|
core.error(error);
|
||||||
}
|
}
|
||||||
core.info(`Task is running on worker cluster`);
|
core.info(`Cloud runner job is running`);
|
||||||
await this.streamLogsUntilTaskStops(ECS, CF, taskDef, cluster, taskArn, streamName);
|
await this.streamLogsUntilTaskStops(ECS, CF, taskDef, cluster, taskArn, streamName);
|
||||||
await ECS.waitFor('tasksStopped', { cluster, tasks: [taskArn] }).promise();
|
await ECS.waitFor('tasksStopped', { cluster, tasks: [taskArn] }).promise();
|
||||||
const exitCode = (
|
const exitCode = (
|
||||||
|
|
@ -85,7 +85,7 @@ class AWSBuildRunner {
|
||||||
);
|
);
|
||||||
throw new Error(`job failed with exit code ${exitCode}`);
|
throw new Error(`job failed with exit code ${exitCode}`);
|
||||||
} else {
|
} else {
|
||||||
core.info(`Task has finished successfully`);
|
core.info(`Cloud runner job has finished successfully`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -127,7 +127,7 @@ class AWSBuildRunner {
|
||||||
|
|
||||||
await CF.waitFor('stackCreateComplete', { StackName: taskDef.taskDefStackNameTTL }).promise();
|
await CF.waitFor('stackCreateComplete', { StackName: taskDef.taskDefStackNameTTL }).promise();
|
||||||
|
|
||||||
core.info(`Task status is ${(await getTaskData())?.lastStatus}`);
|
core.info(`Cloud runner job status is ${(await getTaskData())?.lastStatus}`);
|
||||||
|
|
||||||
const logBaseUrl = `https://${AWS.config.region}.console.aws.amazon.com/cloudwatch/home?region=${AWS.config.region}#logsV2:log-groups/log-group/${taskDef.taskDefStackName}`;
|
const logBaseUrl = `https://${AWS.config.region}.console.aws.amazon.com/cloudwatch/home?region=${AWS.config.region}#logsV2:log-groups/log-group/${taskDef.taskDefStackName}`;
|
||||||
core.info(`You can also see the logs at AWS Cloud Watch: ${logBaseUrl}`);
|
core.info(`You can also see the logs at AWS Cloud Watch: ${logBaseUrl}`);
|
||||||
|
|
@ -139,11 +139,11 @@ class AWSBuildRunner {
|
||||||
const taskData = await getTaskData();
|
const taskData = await getTaskData();
|
||||||
if (taskData?.lastStatus !== 'RUNNING') {
|
if (taskData?.lastStatus !== 'RUNNING') {
|
||||||
if (timestamp === 0) {
|
if (timestamp === 0) {
|
||||||
core.info('Task stopped, streaming end of logs');
|
core.info('Cloud runner job stopped, streaming end of logs');
|
||||||
timestamp = Date.now();
|
timestamp = Date.now();
|
||||||
}
|
}
|
||||||
if (timestamp !== 0 && Date.now() - timestamp < 30000) {
|
if (timestamp !== 0 && Date.now() - timestamp < 30000) {
|
||||||
core.info('Task status is not RUNNING for 30 seconds, last query for logs');
|
core.info('Cloud runner status is not RUNNING for 30 seconds, last query for logs');
|
||||||
readingLogs = false;
|
readingLogs = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -161,7 +161,7 @@ class AWSBuildRunner {
|
||||||
if (json.messageType === 'DATA_MESSAGE') {
|
if (json.messageType === 'DATA_MESSAGE') {
|
||||||
for (let logEventsIndex = 0; logEventsIndex < json.logEvents.length; logEventsIndex++) {
|
for (let logEventsIndex = 0; logEventsIndex < json.logEvents.length; logEventsIndex++) {
|
||||||
if (json.logEvents[logEventsIndex].message.includes(taskDef.logid)) {
|
if (json.logEvents[logEventsIndex].message.includes(taskDef.logid)) {
|
||||||
core.info('End of task logs');
|
core.info('End of cloud runner job logs');
|
||||||
readingLogs = false;
|
readingLogs = false;
|
||||||
} else {
|
} else {
|
||||||
core.info(json.logEvents[logEventsIndex].message);
|
core.info(json.logEvents[logEventsIndex].message);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue