From bd839399933350bad12842d0170cf3c28f9a75d2 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 20 Jun 2019 22:55:57 +0900
Subject: [PATCH] Provide Redis version

---
 src/client/app/common/views/widgets/server.info.vue | 1 +
 src/server/api/endpoints/meta.ts                    | 2 ++
 src/server/web/index.ts                             | 2 ++
 src/server/web/views/info.pug                       | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/src/client/app/common/views/widgets/server.info.vue b/src/client/app/common/views/widgets/server.info.vue
index 41ccd23bf..c6e0d68b1 100644
--- a/src/client/app/common/views/widgets/server.info.vue
+++ b/src/client/app/common/views/widgets/server.info.vue
@@ -4,6 +4,7 @@
 	<p>Machine: {{ meta.machine }}</p>
 	<p>Node: {{ meta.node }}</p>
 	<p>PSQL: {{ meta.psql }}</p>
+	<p>Redis: {{ meta.redis }}</p>
 	<p>Version: {{ meta.version }} </p>
 </div>
 </template>
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 4da0c7476..1aa9a855d 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,
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index ba8f0649c..8cf6a7520 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -21,6 +21,7 @@ import parseAcct from '../../misc/acct/parse';
 import getNoteSummary from '../../misc/get-note-summary';
 import { ensure } from '../../prelude/ensure';
 import { getConnection } from 'typeorm';
+import redis from '../../db/redis';
 
 const client = `${__dirname}/../../client/`;
 
@@ -252,6 +253,7 @@ router.get('/info', async ctx => {
 		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,
 			cores: os.cpus().length
diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug
index f18dcd45e..fc71e5c19 100644
--- a/src/server/web/views/info.pug
+++ b/src/server/web/views/info.pug
@@ -88,6 +88,9 @@ html
 				tr
 					th PSQL version
 					td= psql
+				tr
+					th Redis version
+					td= redis
 				tr
 					th Machine
 					td= machine