review comments

pull/524/head
Frostebite 2023-03-25 00:03:17 +00:00
parent 02c1eb41e6
commit 4c47e3e9f0
3 changed files with 38 additions and 33 deletions

13
dist/index.js vendored
View File

@ -3672,6 +3672,11 @@ class KubernetesTaskRunner {
let didStreamAnyLogs = false;
let shouldReadLogs = true;
let shouldCleanup = true;
try {
// eslint-disable-next-line no-constant-condition
while (true) {
let sinceTime = ``;
if (`${KubernetesTaskRunner.lastReceivedTimestamp}` !== ``) {
const currentDate = new Date(KubernetesTaskRunner.lastReceivedTimestamp);
const dateTimeIsoString = currentDate.toISOString();
// k8s compatible iso date format - split by dot - https://www.googlecloudcommunity.com/gc/Apigee/JS-for-current-timestamp-in-W3C-WSDL-date-format-YYYY-MM-DDThh/td-p/68415
@ -3685,14 +3690,12 @@ class KubernetesTaskRunner {
const minOffset = minZone < 10 ? 0 : '';
const tzd = `${symbolOffset + hourOffset + Math.floor(timeOffsetInHours)}:${minOffset}${minZone}`;
const dateTZDformat = currentDateTime + tzd;
try {
// eslint-disable-next-line no-constant-condition
while (true) {
const sinceTime = `${KubernetesTaskRunner.lastReceivedTimestamp}` !== `` ? `--since-time="${dateTZDformat}" ` : ` `;
sinceTime = ` --since-time="${dateTZDformat}"`;
}
let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false;
// 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`);
for (const chunk of splitLogs) {
if (chunk.replace(/\s/g, ``) === KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``) &&

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -28,6 +28,12 @@ class KubernetesTaskRunner {
let didStreamAnyLogs: boolean = false;
let shouldReadLogs = true;
let shouldCleanup = true;
try {
// eslint-disable-next-line no-constant-condition
while (true) {
let sinceTime = ``;
if (`${KubernetesTaskRunner.lastReceivedTimestamp}` !== ``) {
const currentDate = new Date(KubernetesTaskRunner.lastReceivedTimestamp);
const dateTimeIsoString = currentDate.toISOString();
@ -42,18 +48,14 @@ class KubernetesTaskRunner {
const minOffset = minZone < 10 ? 0 : '';
const tzd = `${symbolOffset + hourOffset + Math.floor(timeOffsetInHours)}:${minOffset}${minZone}`;
const dateTZDformat = currentDateTime + tzd;
try {
// eslint-disable-next-line no-constant-condition
while (true) {
const sinceTime =
`${KubernetesTaskRunner.lastReceivedTimestamp}` !== `` ? `--since-time="${dateTZDformat}" ` : ` `;
sinceTime = ` --since-time="${dateTZDformat}"`;
}
let lastMessageSeenIncludedInChunk = false;
let lastMessageSeen = false;
// using this instead of Kube
const logs = await CloudRunnerSystem.Run(
`kubectl logs ${podName} -f -c ${containerName} --timestamps ${sinceTime}`,
`kubectl logs ${podName} -f -c ${containerName} --timestamps${sinceTime}`,
false,
true,
);