From 11e81c310dd925845255b379e69ed1738d0877af Mon Sep 17 00:00:00 2001 From: Anmol1696 Date: Mon, 17 Jun 2024 19:07:27 +0530 Subject: [PATCH] fix restart counts, print readyness and restart in cli --- clients/js/packages/cli/package.json | 3 ++- clients/js/packages/client/src/client.ts | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/clients/js/packages/cli/package.json b/clients/js/packages/cli/package.json index 60f68e19..6bc0cf67 100644 --- a/clients/js/packages/cli/package.json +++ b/clients/js/packages/cli/package.json @@ -26,7 +26,8 @@ "copy": "copyfiles -f ../../LICENSE README.md package.json dist", "clean": "del dist/**", "prepare": "npm run build", - "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy", + "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy; npm run chmod", + "chmod": "chmod +x dist/index.js", "dev": "ts-node src/index", "test": "jest", "test:watch": "jest --watch" diff --git a/clients/js/packages/client/src/client.ts b/clients/js/packages/client/src/client.ts index 087125cd..7fd4629f 100644 --- a/clients/js/packages/client/src/client.ts +++ b/clients/js/packages/client/src/client.ts @@ -99,7 +99,7 @@ export class StarshipClient implements StarshipClientI { private podStatuses = new Map(); // To keep track of pod statuses // Define a constant for the restart threshold - private readonly RESTART_THRESHOLD = 5; + private readonly RESTART_THRESHOLD = 4; constructor(ctx: StarshipContext) { this.ctx = deepmerge(defaultStarshipContext, ctx); @@ -380,9 +380,9 @@ export class StarshipClient implements StarshipClientI { ...this.getArgs(), ], false, true).trim(); - const [phase, readyList, restartCount, reason] = result.split(/\s+/); + const [phase, readyList, restartCountList, reason] = result.split(/\s+/); const ready = readyList.split(',').every(state => state === 'true'); - const restarts = parseInt(restartCount, 10); + const restarts = restartCountList.split(',').reduce((acc, count) => acc + parseInt(count, 10), 0); this.podStatuses.set(podName, { phase, ready, restartCount: restarts, reason }); @@ -426,7 +426,7 @@ export class StarshipClient implements StarshipClientI { statusColor = chalk.red(status.phase); } - console.log(`[${chalk.blue(podName)}]: ${statusColor}`); + console.log(`[${chalk.blue(podName)}]: ${statusColor}, ${chalk.gray(`Ready: ${status.ready}, Restarts: ${status.restartCount}`)}`); }); }