fixes
parent
1a077d20dd
commit
8ed7856378
|
|
@ -3758,13 +3758,15 @@ class KubernetesTaskRunner {
|
||||||
const logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName} -f -c ${containerName} --timestamps ${sinceTime}`, false, true);
|
const logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName} -f -c ${containerName} --timestamps ${sinceTime}`, false, true);
|
||||||
const splitLogs = logs.split(`\n`);
|
const splitLogs = logs.split(`\n`);
|
||||||
for (const chunk of splitLogs) {
|
for (const chunk of splitLogs) {
|
||||||
if (chunk === KubernetesTaskRunner.lastReceivedMessage) {
|
if (chunk.replace(/\s/g, ``) === KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``) &&
|
||||||
|
KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``) !== ``) {
|
||||||
|
cloud_runner_logger_1.default.log(`Previous log message found ${chunk}`);
|
||||||
lastMessageSeenIncludedInChunk = true;
|
lastMessageSeenIncludedInChunk = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (const chunk of splitLogs) {
|
for (const chunk of splitLogs) {
|
||||||
const newDate = Date.parse(`${chunk.toString().split(`Z `)[0]}Z`);
|
const newDate = Date.parse(`${chunk.toString().split(`Z `)[0]}Z`);
|
||||||
if (chunk === KubernetesTaskRunner.lastReceivedMessage) {
|
if (chunk.replace(/\s/g, ``) === KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``)) {
|
||||||
lastMessageSeen = true;
|
lastMessageSeen = true;
|
||||||
}
|
}
|
||||||
if (lastMessageSeenIncludedInChunk && !lastMessageSeen) {
|
if (lastMessageSeenIncludedInChunk && !lastMessageSeen) {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -41,13 +41,17 @@ class KubernetesTaskRunner {
|
||||||
);
|
);
|
||||||
const splitLogs = logs.split(`\n`);
|
const splitLogs = logs.split(`\n`);
|
||||||
for (const chunk of splitLogs) {
|
for (const chunk of splitLogs) {
|
||||||
if (chunk === KubernetesTaskRunner.lastReceivedMessage) {
|
if (
|
||||||
|
chunk.replace(/\s/g, ``) === KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``) &&
|
||||||
|
KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``) !== ``
|
||||||
|
) {
|
||||||
|
CloudRunnerLogger.log(`Previous log message found ${chunk}`);
|
||||||
lastMessageSeenIncludedInChunk = true;
|
lastMessageSeenIncludedInChunk = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (const chunk of splitLogs) {
|
for (const chunk of splitLogs) {
|
||||||
const newDate = Date.parse(`${chunk.toString().split(`Z `)[0]}Z`);
|
const newDate = Date.parse(`${chunk.toString().split(`Z `)[0]}Z`);
|
||||||
if (chunk === KubernetesTaskRunner.lastReceivedMessage) {
|
if (chunk.replace(/\s/g, ``) === KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``)) {
|
||||||
lastMessageSeen = true;
|
lastMessageSeen = true;
|
||||||
}
|
}
|
||||||
if (lastMessageSeenIncludedInChunk && !lastMessageSeen) {
|
if (lastMessageSeenIncludedInChunk && !lastMessageSeen) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue