Skip to content

Commit af9c473

Browse files
authored
Merge pull request #534 from kexa-io/dev
fix(kube): added catch for abort() + logs
2 parents e4bf73b + a1f0ffc commit af9c473

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

Kexa/services/addOn/kubernetesGathering.service.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,11 @@ async function collectPodLogs(k8sLog: any, k8sApiCore: any, namespace: string):
951951
);
952952
if (req) {
953953
await delay(1000);
954-
req.abort();
954+
try {
955+
req.abort();
956+
} catch (abortErr: any) {
957+
logger.silly(`Log stream aborted for pod: ${pod.metadata.name}, container: ${containerName}`);
958+
}
955959
}
956960
} catch (err: any) {
957961
logger.debug(`Error when retrieving log on pod: ${pod.metadata.name}, container: ${containerName} (${err})`);

kexa-sbom.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"spdxVersion":"SPDX-2.3","dataLicense":"CC0-1.0","SPDXID":"SPDXRef-DOCUMENT","name":"bun.lock","documentNamespace":"https://anchore.com/syft/file/bun.lock-d5725459-d3c4-47a4-8f7f-ce8d74efa0dd","creationInfo":{"licenseListVersion":"3.27","creators":["Organization: Anchore, Inc","Tool: syft-1.33.0"],"created":"2025-10-01T11:36:15Z"},"packages":[{"name":"bun.lock","SPDXID":"SPDXRef-DocumentRoot-File-bun.lock","versionInfo":"sha256:0c40f800ccc0bafe72357142a0a7157d4975c9bbb57618b66fe5deb8a987797d","supplier":"NOASSERTION","downloadLocation":"NOASSERTION","filesAnalyzed":false,"checksums":[{"algorithm":"SHA256","checksumValue":"0c40f800ccc0bafe72357142a0a7157d4975c9bbb57618b66fe5deb8a987797d"}],"licenseConcluded":"NOASSERTION","licenseDeclared":"NOASSERTION","copyrightText":"NOASSERTION","primaryPackagePurpose":"FILE"}],"relationships":[{"spdxElementId":"SPDXRef-DOCUMENT","relatedSpdxElement":"SPDXRef-DocumentRoot-File-bun.lock","relationshipType":"DESCRIBES"}]}
1+
{"spdxVersion":"SPDX-2.3","dataLicense":"CC0-1.0","SPDXID":"SPDXRef-DOCUMENT","name":"bun.lock","documentNamespace":"https://anchore.com/syft/file/bun.lock-33c66e88-a751-435d-877d-fb5b85694f44","creationInfo":{"licenseListVersion":"3.27","creators":["Organization: Anchore, Inc","Tool: syft-1.33.0"],"created":"2025-10-02T09:04:09Z"},"packages":[{"name":"bun.lock","SPDXID":"SPDXRef-DocumentRoot-File-bun.lock","versionInfo":"sha256:0c40f800ccc0bafe72357142a0a7157d4975c9bbb57618b66fe5deb8a987797d","supplier":"NOASSERTION","downloadLocation":"NOASSERTION","filesAnalyzed":false,"checksums":[{"algorithm":"SHA256","checksumValue":"0c40f800ccc0bafe72357142a0a7157d4975c9bbb57618b66fe5deb8a987797d"}],"licenseConcluded":"NOASSERTION","licenseDeclared":"NOASSERTION","copyrightText":"NOASSERTION","primaryPackagePurpose":"FILE"}],"relationships":[{"spdxElementId":"SPDXRef-DOCUMENT","relatedSpdxElement":"SPDXRef-DocumentRoot-File-bun.lock","relationshipType":"DESCRIBES"}]}

0 commit comments

Comments
 (0)