diff --git a/client/package.json b/client/package.json index a917b9a6..c7986191 100644 --- a/client/package.json +++ b/client/package.json @@ -12,7 +12,7 @@ "dependencies": { "@mdi/font": "7.0.96", "apexcharts": "^3.49.0", - "axios": "^1.6.2", + "axios": "^1.7.4", "chart.js": "^4.4.1", "core-js": "^3.29.0", "lodash": "^4.17.21", diff --git a/client/yarn.lock b/client/yarn.lock index 449bc40d..71644694 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -574,10 +574,10 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -axios@^1.6.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" - integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== +axios@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2" + integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -1251,9 +1251,9 @@ merge2@^1.3.0, merge2@^1.4.1: integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== micromatch@^4.0.4: - version "4.0.7" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" - integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== + version "4.0.8" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== dependencies: braces "^3.0.3" picomatch "^2.3.1" diff --git a/server/src/configure.ts b/server/src/configure.ts index 182fd9bf..11bc19af 100644 --- a/server/src/configure.ts +++ b/server/src/configure.ts @@ -35,7 +35,9 @@ const { KUBERO_SESSION_KEY = crypto.randomBytes(20).toString('hex') } = process. export const configure = async (app: Express, server: Server) => { // Load Version from File - process.env.npm_package_version = fs.readFileSync('./VERSION','utf8');; + process.env.npm_package_version = fs.readFileSync('./VERSION','utf8'); + + console.log("Kubero Version: " + process.env.npm_package_version); app.use(cors()) app.use(cookieParser()) diff --git a/server/src/modules/metrics.ts b/server/src/modules/metrics.ts index 6a544812..17f536aa 100644 --- a/server/src/modules/metrics.ts +++ b/server/src/modules/metrics.ts @@ -64,11 +64,16 @@ export class Metrics { } public async getStatus(): Promise { - const status = await this.prom.status(); - if (status === undefined || status === null || status === false) { + try { + const status = await this.prom.status(); + + if (status === undefined || status === null || status === false) { + return false; + } else { + return true; + } + } catch (error) { return false; - } else { - return true; } }