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

8
dist/index.js vendored
View File

@ -3695,14 +3695,14 @@ class KubernetesTaskRunner {
sinceTime = ` --since-time="${dateTimeIsoString}"`; sinceTime = ` --since-time="${dateTimeIsoString}"`;
} }
let extraFlags = ``; let extraFlags = ``;
if (!(await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient))) { extraFlags += (await kubernetes_pods_1.default.IsPodRunning(podName, namespace, kubeClient))
extraFlags += ` -p`; ? ` -c ${containerName}`
} : ` -p`;
let lastMessageSeenIncludedInChunk = false; let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false; let lastMessageSeen = false;
let logs; let logs;
try { 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) { catch (error) {
cloud_runner_logger_1.default.log(`K8s logging error ${error}`); cloud_runner_logger_1.default.log(`K8s logging error ${error}`);

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

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