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-25 19:36:02 +00:00
parent ca91488033
commit 188bc2892a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/index.js generated vendored
View File

@ -3695,14 +3695,14 @@ class KubernetesTaskRunner {
sinceTime = ` --since-time="${dateTimeIsoString}"`;
}
let extraFlags = ``;
if (!(await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient))) {
extraFlags += ` -p`;
}
extraFlags += (await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient))
? ` -c ${containerName}`
: ` -p`;
let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false;
let logs;
try {
logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName}${extraFlags} -f -c ${containerName} --timestamps${sinceTime}`, false, true);
logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podName}${extraFlags} -f --timestamps${sinceTime}`, false, true);
}
catch (error) {
cloud_runner_logger_1.default.log(`K8s logging error ${error}`);

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

File diff suppressed because one or more lines are too long

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

@ -36,9 +36,9 @@ class KubernetesTaskRunner {
sinceTime = ` --since-time="${dateTimeIsoString}"`;
}
let extraFlags = ``;
if (!(await KubernetesPods.IsPodRunning(podName, namespace, kubeClient))) {
extraFlags += ` -p`;
}
extraFlags += (await KubernetesPods.IsPodRunning(podName, namespace, kubeClient))
? ` -c ${containerName}`
: ` -p`;
let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false;
@ -46,7 +46,7 @@ class KubernetesTaskRunner {
try {
logs = await CloudRunnerSystem.Run(
`kubectl logs ${podName}${extraFlags} -f -c ${containerName} --timestamps${sinceTime}`,
`kubectl logs ${podName}${extraFlags} -f --timestamps${sinceTime}`,
false,
true,
);