summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-06-18 15:56:03 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-06-18 15:56:03 +0900
commitbb52ebdc3eb53db826e488ff50af04478edc50cb (patch)
treed17fc61f2ea6999b35de0a090cc08443bb6d807a
parentUse WHATWG API (diff)
downloadsharkey-bb52ebdc3eb53db826e488ff50af04478edc50cb.tar.gz
sharkey-bb52ebdc3eb53db826e488ff50af04478edc50cb.tar.bz2
sharkey-bb52ebdc3eb53db826e488ff50af04478edc50cb.zip
Provide version of postgresql
-rw-r--r--src/client/app/common/views/widgets/server.info.vue1
-rw-r--r--src/server/api/endpoints/meta.ts2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/client/app/common/views/widgets/server.info.vue b/src/client/app/common/views/widgets/server.info.vue
index a97b4ec496..41ccd23bfe 100644
--- a/src/client/app/common/views/widgets/server.info.vue
+++ b/src/client/app/common/views/widgets/server.info.vue
@@ -3,6 +3,7 @@
<p>Maintainer: <b><a :href="'mailto:' + meta.maintainerEmail" target="_blank">{{ meta.maintainerName }}</a></b></p>
<p>Machine: {{ meta.machine }}</p>
<p>Node: {{ meta.node }}</p>
+ <p>PSQL: {{ meta.psql }}</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 d18543f56a..4da0c7476c 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -6,6 +6,7 @@ import { fetchMeta } from '../../../misc/fetch-meta';
import * as pkg from '../../../../package.json';
import { Emojis } from '../../../models';
import { types, bool } from '../../../misc/schema';
+import { getConnection } from 'typeorm';
export const meta = {
stability: 'stable',
@@ -114,6 +115,7 @@ export default define(meta, async (ps, me) => {
machine: os.hostname(),
os: os.platform(),
node: process.version,
+ psql: await getConnection().query('SHOW server_version').then(x => x[0].server_version),
cpu: {
model: os.cpus()[0].model,