Skip to content

Commit 9be9d05

Browse files
committed
add redis process time and add timeout clause
1 parent bd7dfc6 commit 9be9d05

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

src/routes/getStatus.ts

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,40 @@ import { Logger } from "../utils/logger";
33
import { Request, Response } from "express";
44
import os from "os";
55
import redis from "../utils/redis";
6+
import { setTimeout } from "timers/promises";
67

78
export async function getStatus(req: Request, res: Response): Promise<Response> {
89
const startTime = Date.now();
910
let value = req.params.value as string[] | string;
1011
value = Array.isArray(value) ? value[0] : value;
12+
let processTime, redisProcessTime = -1;
13+
const timeoutPromise = async (): Promise<string> => {
14+
await setTimeout(5000);
15+
return "timeout";
16+
};
1117
try {
12-
const dbVersion = (await db.prepare("get", "SELECT key, value FROM config where key = ?", ["version"])).value;
18+
const dbVersion = await Promise.race([db.prepare("get", "SELECT key, value FROM config where key = ?", ["version"]), timeoutPromise()])
19+
.then(e => {
20+
if (e === "timeout") return e;
21+
processTime = Date.now() - startTime;
22+
return e.value;
23+
});
1324
let statusRequests: unknown = 0;
14-
try {
15-
const numberRequests = await redis.increment("statusRequest");
16-
statusRequests = numberRequests?.[0];
17-
} catch (error) { } // eslint-disable-line no-empty
25+
const numberRequests = await Promise.race([redis.increment("statusRequest"), timeoutPromise()])
26+
.then(e => {
27+
if (e === "timeout") return [-1];
28+
redisProcessTime = Date.now() - startTime;
29+
return e;
30+
});
31+
statusRequests = numberRequests?.[0];
1832

1933
const statusValues: Record<string, any> = {
2034
uptime: process.uptime(),
2135
commit: (global as any).HEADCOMMIT || "unknown",
2236
db: Number(dbVersion),
2337
startTime,
24-
processTime: Date.now() - startTime,
38+
processTime,
39+
redisProcessTime,
2540
loadavg: os.loadavg().slice(1), // only return 5 & 15 minute load average
2641
statusRequests,
2742
hostname: os.hostname()

test/cases/getStatus.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,16 @@ describe("getStatus", () => {
110110
})
111111
.catch(err => done(err));
112112
});
113+
114+
it("Should be able to get redis latency", function (done) {
115+
if (!config.redis?.enabled) this.skip();
116+
client.get(endpoint)
117+
.then(res => {
118+
assert.strictEqual(res.status, 200);
119+
const data = res.data;
120+
assert.ok(data.redisProcessTime >= 0);
121+
done();
122+
})
123+
.catch(err => done(err));
124+
});
113125
});

0 commit comments

Comments
 (0)