summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-06-23 00:22:33 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-06-23 00:22:33 +0900
commit73ac2632c25270e1ea5e435f62fc29af9bfb09a1 (patch)
tree1c187f4b861ee91ae67bfcf6fd3e50183c9df442 /src/server/api/endpoints
parentMerge branch 'develop' (diff)
parent11.23.0 (diff)
downloadsharkey-73ac2632c25270e1ea5e435f62fc29af9bfb09a1.tar.gz
sharkey-73ac2632c25270e1ea5e435f62fc29af9bfb09a1.tar.bz2
sharkey-73ac2632c25270e1ea5e435f62fc29af9bfb09a1.zip
Merge branch 'develop'
Diffstat (limited to 'src/server/api/endpoints')
-rw-r--r--src/server/api/endpoints/meta.ts2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 4da0c7476c..1aa9a855dd 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -7,6 +7,7 @@ import * as pkg from '../../../../package.json';
import { Emojis } from '../../../models';
import { types, bool } from '../../../misc/schema';
import { getConnection } from 'typeorm';
+import redis from '../../../db/redis';
export const meta = {
stability: 'stable',
@@ -116,6 +117,7 @@ export default define(meta, async (ps, me) => {
os: os.platform(),
node: process.version,
psql: await getConnection().query('SHOW server_version').then(x => x[0].server_version),
+ redis: redis.server_info.redis_version,
cpu: {
model: os.cpus()[0].model,