summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/admin/server-info.ts
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2022-06-24 19:22:19 +0900
committerGitHub <noreply@github.com>2022-06-24 19:22:19 +0900
commit6f8e3fe36633836d36c5447d78636f370b36cd84 (patch)
tree30a7add8183af548da5ef4ae88b43df271ba5f21 /packages/backend/src/server/api/endpoints/admin/server-info.ts
parentfix(client): ask to log in for poll vote (#8883) (diff)
downloadsharkey-6f8e3fe36633836d36c5447d78636f370b36cd84.tar.gz
sharkey-6f8e3fe36633836d36c5447d78636f370b36cd84.tar.bz2
sharkey-6f8e3fe36633836d36c5447d78636f370b36cd84.zip
enhance: Redisをioredisに統一してIPv6サポート (#8869)
* Use ioredis, Supports IPv6 host https://github.com/misskey-dev/misskey/issues/8862 * Fix import * order * a * i * fix * flushdb * family * CHANGELOG * redis_version Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/server/api/endpoints/admin/server-info.ts')
-rw-r--r--packages/backend/src/server/api/endpoints/admin/server-info.ts6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/backend/src/server/api/endpoints/admin/server-info.ts b/packages/backend/src/server/api/endpoints/admin/server-info.ts
index 9c150420b1..85c6fb82e7 100644
--- a/packages/backend/src/server/api/endpoints/admin/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/admin/server-info.ts
@@ -99,12 +99,16 @@ export default define(meta, paramDef, async () => {
const fsStats = await si.fsSize();
const netInterface = await si.networkInterfaceDefault();
+ const redisServerInfo = await redisClient.info('Server');
+ const m = redisServerInfo.match(new RegExp('^redis_version:(.*)', 'm'));
+ const redis_version = m?.[1];
+
return {
machine: os.hostname(),
os: os.platform(),
node: process.version,
psql: await db.query('SHOW server_version').then(x => x[0].server_version),
- redis: redisClient.server_info.redis_version,
+ redis: redis_version,
cpu: {
model: os.cpus()[0].model,
cores: os.cpus().length,