actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

pull/524/head
Frostebite 2023-03-18 01:40:25 +00:00
parent 5fcdbc00fe
commit 4305b0e6c5
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/index.js generated vendored
View File

@ -3752,20 +3752,26 @@ class KubernetesTaskRunner {
const sinceTime = KubernetesTaskRunner.lastReceivedTimestamp const sinceTime = KubernetesTaskRunner.lastReceivedTimestamp
? `--since-time="${new Date(KubernetesTaskRunner.lastReceivedTimestamp + 1).toISOString()}" ` ? `--since-time="${new Date(KubernetesTaskRunner.lastReceivedTimestamp + 1).toISOString()}" `
: ` `; : ` `;
let started = false; let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false;
// using this instead of Kube // using this instead of Kube
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) {
if (chunk === KubernetesTaskRunner.lastReceivedMessage) {
lastMessageSeenIncludedInChunk = true;
}
}
for (const element of splitLogs) { for (const element of splitLogs) {
didStreamAnyLogs = true; didStreamAnyLogs = true;
const chunk = element; const chunk = element;
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();
if (chunk !== KubernetesTaskRunner.lastReceivedMessage) { if (chunk === KubernetesTaskRunner.lastReceivedMessage) {
started = true; lastMessageSeen = true;
} }
if (!started) { if (lastMessageSeenIncludedInChunk && !lastMessageSeen) {
continue; continue;
} }
const message = cloud_runner_1.default.buildParameters.cloudRunnerDebug ? chunk : chunk.split(`Z `)[1]; const message = cloud_runner_1.default.buildParameters.cloudRunnerDebug ? chunk : chunk.split(`Z `)[1];

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

14
src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts
View File

@ -30,7 +30,8 @@ class KubernetesTaskRunner {
const sinceTime = KubernetesTaskRunner.lastReceivedTimestamp const sinceTime = KubernetesTaskRunner.lastReceivedTimestamp
? `--since-time="${new Date(KubernetesTaskRunner.lastReceivedTimestamp + 1).toISOString()}" ` ? `--since-time="${new Date(KubernetesTaskRunner.lastReceivedTimestamp + 1).toISOString()}" `
: ` `; : ` `;
let started = false; let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false;
// using this instead of Kube // using this instead of Kube
const logs = await CloudRunnerSystem.Run( const logs = await CloudRunnerSystem.Run(
@ -39,16 +40,21 @@ class KubernetesTaskRunner {
true, true,
); );
const splitLogs = logs.split(`\n`); const splitLogs = logs.split(`\n`);
for (const chunk of splitLogs) {
if (chunk === KubernetesTaskRunner.lastReceivedMessage) {
lastMessageSeenIncludedInChunk = true;
}
}
for (const element of splitLogs) { for (const element of splitLogs) {
didStreamAnyLogs = true; didStreamAnyLogs = true;
const chunk = element; const chunk = element;
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();
if (chunk !== KubernetesTaskRunner.lastReceivedMessage) { if (chunk === KubernetesTaskRunner.lastReceivedMessage) {
started = true; lastMessageSeen = true;
} }
if (!started) { if (lastMessageSeenIncludedInChunk && !lastMessageSeen) {
continue; continue;
} }
const message = CloudRunner.buildParameters.cloudRunnerDebug ? chunk : chunk.split(`Z `)[1]; const message = CloudRunner.buildParameters.cloudRunnerDebug ? chunk : chunk.split(`Z `)[1];