fixes
parent
43d74a0d7e
commit
af89031a49
|
|
@ -52,7 +52,7 @@ jobs:
|
||||||
cloudRunnerCluster:
|
cloudRunnerCluster:
|
||||||
# - aws
|
# - aws
|
||||||
- local-docker
|
- local-docker
|
||||||
# - k8s
|
- k8s
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout (default)
|
- name: Checkout (default)
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
|
||||||
|
|
@ -3762,18 +3762,18 @@ class KubernetesTaskRunner {
|
||||||
const dateString = `${chunk.toString().split(`Z `)[0]}Z`;
|
const dateString = `${chunk.toString().split(`Z `)[0]}Z`;
|
||||||
const newDate = Date.parse(dateString);
|
const newDate = Date.parse(dateString);
|
||||||
new Date(newDate).toISOString();
|
new Date(newDate).toISOString();
|
||||||
const message = cloud_runner_1.default.buildParameters.cloudRunnerDebug ? chunk : chunk.split(`Z `)[1];
|
if (splitLogs[splitLogs.length - 1] !== KubernetesTaskRunner.lastReceivedMessage ||
|
||||||
if (message !== KubernetesTaskRunner.lastReceivedMessage ||
|
|
||||||
KubernetesTaskRunner.lastReceivedTimestamp < newDate) {
|
KubernetesTaskRunner.lastReceivedTimestamp < newDate) {
|
||||||
started = true;
|
started = true;
|
||||||
}
|
}
|
||||||
if (!started) {
|
if (!started) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
KubernetesTaskRunner.lastReceivedMessage = message;
|
const message = cloud_runner_1.default.buildParameters.cloudRunnerDebug ? chunk : chunk.split(`Z `)[1];
|
||||||
KubernetesTaskRunner.lastReceivedTimestamp = newDate;
|
KubernetesTaskRunner.lastReceivedTimestamp = newDate;
|
||||||
({ shouldReadLogs, shouldCleanup, output } = follow_log_stream_service_1.FollowLogStreamService.handleIteration(message, shouldReadLogs, shouldCleanup, output));
|
({ shouldReadLogs, shouldCleanup, output } = follow_log_stream_service_1.FollowLogStreamService.handleIteration(message, shouldReadLogs, shouldCleanup, output));
|
||||||
}
|
}
|
||||||
|
KubernetesTaskRunner.lastReceivedMessage = splitLogs[splitLogs.length - 1];
|
||||||
if (!didStreamAnyLogs) {
|
if (!didStreamAnyLogs) {
|
||||||
core.error('Failed to stream any logs, listing namespace events, check for an error with the container');
|
core.error('Failed to stream any logs, listing namespace events, check for an error with the container');
|
||||||
core.error(JSON.stringify({
|
core.error(JSON.stringify({
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -45,9 +45,8 @@ class KubernetesTaskRunner {
|
||||||
const dateString = `${chunk.toString().split(`Z `)[0]}Z`;
|
const dateString = `${chunk.toString().split(`Z `)[0]}Z`;
|
||||||
const newDate = Date.parse(dateString);
|
const newDate = Date.parse(dateString);
|
||||||
new Date(newDate).toISOString();
|
new Date(newDate).toISOString();
|
||||||
const message = CloudRunner.buildParameters.cloudRunnerDebug ? chunk : chunk.split(`Z `)[1];
|
|
||||||
if (
|
if (
|
||||||
message !== KubernetesTaskRunner.lastReceivedMessage ||
|
splitLogs[splitLogs.length - 1] !== KubernetesTaskRunner.lastReceivedMessage ||
|
||||||
KubernetesTaskRunner.lastReceivedTimestamp < newDate
|
KubernetesTaskRunner.lastReceivedTimestamp < newDate
|
||||||
) {
|
) {
|
||||||
started = true;
|
started = true;
|
||||||
|
|
@ -55,7 +54,7 @@ class KubernetesTaskRunner {
|
||||||
if (!started) {
|
if (!started) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
KubernetesTaskRunner.lastReceivedMessage = message;
|
const message = CloudRunner.buildParameters.cloudRunnerDebug ? chunk : chunk.split(`Z `)[1];
|
||||||
KubernetesTaskRunner.lastReceivedTimestamp = newDate;
|
KubernetesTaskRunner.lastReceivedTimestamp = newDate;
|
||||||
({ shouldReadLogs, shouldCleanup, output } = FollowLogStreamService.handleIteration(
|
({ shouldReadLogs, shouldCleanup, output } = FollowLogStreamService.handleIteration(
|
||||||
message,
|
message,
|
||||||
|
|
@ -64,6 +63,7 @@ class KubernetesTaskRunner {
|
||||||
output,
|
output,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
KubernetesTaskRunner.lastReceivedMessage = splitLogs[splitLogs.length - 1];
|
||||||
|
|
||||||
if (!didStreamAnyLogs) {
|
if (!didStreamAnyLogs) {
|
||||||
core.error('Failed to stream any logs, listing namespace events, check for an error with the container');
|
core.error('Failed to stream any logs, listing namespace events, check for an error with the container');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue