review comments
parent
02c1eb41e6
commit
4c47e3e9f0
|
|
@ -3672,27 +3672,30 @@ class KubernetesTaskRunner {
|
||||||
let didStreamAnyLogs = false;
|
let didStreamAnyLogs = false;
|
||||||
let shouldReadLogs = true;
|
let shouldReadLogs = true;
|
||||||
let shouldCleanup = true;
|
let shouldCleanup = true;
|
||||||
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
|
|
||||||
const currentDateTime = dateTimeIsoString.split('.')[0];
|
|
||||||
const timeZoneOffset = currentDate.getTimezoneOffset();
|
|
||||||
const positiveOffset = Math.abs(timeZoneOffset);
|
|
||||||
const timeOffsetInHours = -(timeZoneOffset / 60);
|
|
||||||
const minZone = positiveOffset - Math.floor(timeOffsetInHours) * 60;
|
|
||||||
const symbolOffset = timeZoneOffset > 0 ? '-' : '+';
|
|
||||||
const hourOffset = Math.floor(timeOffsetInHours) < 10 ? 0 : '';
|
|
||||||
const minOffset = minZone < 10 ? 0 : '';
|
|
||||||
const tzd = `${symbolOffset + hourOffset + Math.floor(timeOffsetInHours)}:${minOffset}${minZone}`;
|
|
||||||
const dateTZDformat = currentDateTime + tzd;
|
|
||||||
try {
|
try {
|
||||||
// eslint-disable-next-line no-constant-condition
|
// eslint-disable-next-line no-constant-condition
|
||||||
while (true) {
|
while (true) {
|
||||||
const sinceTime = `${KubernetesTaskRunner.lastReceivedTimestamp}` !== `` ? `--since-time="${dateTZDformat}" ` : ` `;
|
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
|
||||||
|
const currentDateTime = dateTimeIsoString.split('.')[0];
|
||||||
|
const timeZoneOffset = currentDate.getTimezoneOffset();
|
||||||
|
const positiveOffset = Math.abs(timeZoneOffset);
|
||||||
|
const timeOffsetInHours = -(timeZoneOffset / 60);
|
||||||
|
const minZone = positiveOffset - Math.floor(timeOffsetInHours) * 60;
|
||||||
|
const symbolOffset = timeZoneOffset > 0 ? '-' : '+';
|
||||||
|
const hourOffset = Math.floor(timeOffsetInHours) < 10 ? 0 : '';
|
||||||
|
const minOffset = minZone < 10 ? 0 : '';
|
||||||
|
const tzd = `${symbolOffset + hourOffset + Math.floor(timeOffsetInHours)}:${minOffset}${minZone}`;
|
||||||
|
const dateTZDformat = currentDateTime + tzd;
|
||||||
|
sinceTime = ` --since-time="${dateTZDformat}"`;
|
||||||
|
}
|
||||||
let lastMessageSeenIncludedInChunk = false;
|
let lastMessageSeenIncludedInChunk = false;
|
||||||
let lastMessageSeen = 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) {
|
for (const chunk of splitLogs) {
|
||||||
if (chunk.replace(/\s/g, ``) === KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``) &&
|
if (chunk.replace(/\s/g, ``) === KubernetesTaskRunner.lastReceivedMessage.replace(/\s/g, ``) &&
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -28,32 +28,34 @@ class KubernetesTaskRunner {
|
||||||
let didStreamAnyLogs: boolean = false;
|
let didStreamAnyLogs: boolean = false;
|
||||||
let shouldReadLogs = true;
|
let shouldReadLogs = true;
|
||||||
let shouldCleanup = true;
|
let shouldCleanup = true;
|
||||||
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
|
|
||||||
const currentDateTime = dateTimeIsoString.split('.')[0];
|
|
||||||
const timeZoneOffset = currentDate.getTimezoneOffset();
|
|
||||||
const positiveOffset = Math.abs(timeZoneOffset);
|
|
||||||
const timeOffsetInHours = -(timeZoneOffset / 60);
|
|
||||||
const minZone = positiveOffset - Math.floor(timeOffsetInHours) * 60;
|
|
||||||
const symbolOffset = timeZoneOffset > 0 ? '-' : '+';
|
|
||||||
const hourOffset = Math.floor(timeOffsetInHours) < 10 ? 0 : '';
|
|
||||||
const minOffset = minZone < 10 ? 0 : '';
|
|
||||||
const tzd = `${symbolOffset + hourOffset + Math.floor(timeOffsetInHours)}:${minOffset}${minZone}`;
|
|
||||||
const dateTZDformat = currentDateTime + tzd;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// eslint-disable-next-line no-constant-condition
|
// eslint-disable-next-line no-constant-condition
|
||||||
while (true) {
|
while (true) {
|
||||||
const sinceTime =
|
let sinceTime = ``;
|
||||||
`${KubernetesTaskRunner.lastReceivedTimestamp}` !== `` ? `--since-time="${dateTZDformat}" ` : ` `;
|
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
|
||||||
|
const currentDateTime = dateTimeIsoString.split('.')[0];
|
||||||
|
const timeZoneOffset = currentDate.getTimezoneOffset();
|
||||||
|
const positiveOffset = Math.abs(timeZoneOffset);
|
||||||
|
const timeOffsetInHours = -(timeZoneOffset / 60);
|
||||||
|
const minZone = positiveOffset - Math.floor(timeOffsetInHours) * 60;
|
||||||
|
const symbolOffset = timeZoneOffset > 0 ? '-' : '+';
|
||||||
|
const hourOffset = Math.floor(timeOffsetInHours) < 10 ? 0 : '';
|
||||||
|
const minOffset = minZone < 10 ? 0 : '';
|
||||||
|
const tzd = `${symbolOffset + hourOffset + Math.floor(timeOffsetInHours)}:${minOffset}${minZone}`;
|
||||||
|
const dateTZDformat = currentDateTime + tzd;
|
||||||
|
sinceTime = ` --since-time="${dateTZDformat}"`;
|
||||||
|
}
|
||||||
let lastMessageSeenIncludedInChunk = false;
|
let lastMessageSeenIncludedInChunk = false;
|
||||||
let lastMessageSeen = false;
|
let lastMessageSeen = false;
|
||||||
|
|
||||||
// using this instead of Kube
|
// using this instead of Kube
|
||||||
const logs = await CloudRunnerSystem.Run(
|
const logs = await CloudRunnerSystem.Run(
|
||||||
`kubectl logs ${podName} -f -c ${containerName} --timestamps ${sinceTime}`,
|
`kubectl logs ${podName} -f -c ${containerName} --timestamps${sinceTime}`,
|
||||||
false,
|
false,
|
||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue