Skip to content

Commit 2c50be4

Browse files
#RI-3704 - change try catch order
1 parent 7cde6e6 commit 2c50be4

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

redisinsight/api/src/modules/database/utils/database.total.util.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ import { get } from 'lodash';
33
import { convertBulkStringsToObject, convertRedisInfoReplyToObject } from 'src/utils';
44

55
const getTotalFromInfo = async (client: Redis) => {
6-
const currentDbIndex = get(client, ['options', 'db'], 0);
7-
const info = convertRedisInfoReplyToObject(
8-
await client.sendCommand(new Command('info', ['keyspace'], {
9-
replyEncoding: 'utf8',
10-
})) as string,
11-
);
6+
try {
7+
const currentDbIndex = get(client, ['options', 'db'], 0);
8+
const info = convertRedisInfoReplyToObject(
9+
await client.sendCommand(new Command('info', ['keyspace'], {
10+
replyEncoding: 'utf8',
11+
})) as string,
12+
);
1213

13-
const dbInfo = get(info, 'keyspace', {});
14-
if (!dbInfo[`db${currentDbIndex}`]) {
15-
return 0;
16-
}
14+
const dbInfo = get(info, 'keyspace', {});
15+
if (!dbInfo[`db${currentDbIndex}`]) {
16+
return 0;
17+
}
1718

18-
const { keys } = convertBulkStringsToObject(dbInfo[`db${currentDbIndex}`], ',', '=');
19-
return parseInt(keys, 10);
20-
};
21-
22-
const getTotalFromDBSize = async (client: Redis) => {
23-
try {
24-
const dbsize = await client.sendCommand(new Command('dbsize', [], {
25-
replyEncoding: 'utf8',
26-
})) as string;
27-
return parseInt(dbsize, 10);
19+
const { keys } = convertBulkStringsToObject(dbInfo[`db${currentDbIndex}`], ',', '=');
20+
return parseInt(keys, 10);
2821
} catch (err) {
2922
return -1;
3023
}
3124
};
3225

26+
const getTotalFromDBSize = async (client: Redis) => {
27+
const dbsize = await client.sendCommand(new Command('dbsize', [], {
28+
replyEncoding: 'utf8',
29+
})) as string;
30+
return parseInt(dbsize, 10);
31+
};
32+
3333
export const getTotal = async (
3434
client: Redis,
3535
): Promise<number> => {

0 commit comments

Comments
 (0)