Skip to content

Commit 27365f1

Browse files
authored
Merge pull request #397 from kubero-dev/release/v2.4.1
Release/v2.4.1
2 parents 025a63e + dafc2af commit 27365f1

File tree

4 files changed

+20
-13
lines changed

4 files changed

+20
-13
lines changed

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@mdi/font": "7.0.96",
1414
"apexcharts": "^3.49.0",
15-
"axios": "^1.6.2",
15+
"axios": "^1.7.4",
1616
"chart.js": "^4.4.1",
1717
"core-js": "^3.29.0",
1818
"lodash": "^4.17.21",

client/yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -574,10 +574,10 @@ asynckit@^0.4.0:
574574
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
575575
integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
576576

577-
axios@^1.6.2:
578-
version "1.7.2"
579-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
580-
integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
577+
axios@^1.7.4:
578+
version "1.7.4"
579+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
580+
integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
581581
dependencies:
582582
follow-redirects "^1.15.6"
583583
form-data "^4.0.0"
@@ -1251,9 +1251,9 @@ merge2@^1.3.0, merge2@^1.4.1:
12511251
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
12521252

12531253
micromatch@^4.0.4:
1254-
version "4.0.7"
1255-
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
1256-
integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
1254+
version "4.0.8"
1255+
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
1256+
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
12571257
dependencies:
12581258
braces "^3.0.3"
12591259
picomatch "^2.3.1"

server/src/configure.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ const { KUBERO_SESSION_KEY = crypto.randomBytes(20).toString('hex') } = process.
3535

3636
export const configure = async (app: Express, server: Server) => {
3737
// Load Version from File
38-
process.env.npm_package_version = fs.readFileSync('./VERSION','utf8');;
38+
process.env.npm_package_version = fs.readFileSync('./VERSION','utf8');
39+
40+
console.log("Kubero Version: " + process.env.npm_package_version);
3941

4042
app.use(cors())
4143
app.use(cookieParser())

server/src/modules/metrics.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,16 @@ export class Metrics {
6464
}
6565

6666
public async getStatus(): Promise<boolean> {
67-
const status = await this.prom.status();
68-
if (status === undefined || status === null || status === false) {
67+
try {
68+
const status = await this.prom.status();
69+
70+
if (status === undefined || status === null || status === false) {
71+
return false;
72+
} else {
73+
return true;
74+
}
75+
} catch (error) {
6976
return false;
70-
} else {
71-
return true;
7277
}
7378
}
7479

0 commit comments

Comments
 (0)