diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-08-22 09:12:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 09:12:59 +0900 |
| commit | 64280665529e79850bfb918843b2d427f20965f2 (patch) | |
| tree | 97fa47dc7f3326df0aea6a26478c0cfedc918eb6 /src | |
| parent | Revert "#2387" (diff) | |
| parent | Fix DB connectivity check (diff) | |
| download | misskey-64280665529e79850bfb918843b2d427f20965f2.tar.gz misskey-64280665529e79850bfb918843b2d427f20965f2.tar.bz2 misskey-64280665529e79850bfb918843b2d427f20965f2.zip | |
Merge pull request #2388 from mei23/mei-0822-dbcheck
起動時のDB接続チェックでエラーを検出できないのを修正
Diffstat (limited to 'src')
| -rw-r--r-- | src/index.ts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/index.ts b/src/index.ts index 086e665679..470699eab9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,6 +14,7 @@ import * as portscanner from 'portscanner'; import isRoot = require('is-root'); import Xev from 'xev'; import * as program from 'commander'; +import mongo from './db/mongodb'; import Logger from './misc/logger'; import ProgressBar from './misc/cli/progressbar'; @@ -158,8 +159,13 @@ function checkMongoDb(config: Config) { const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null; const uri = `mongodb://${u && p ? `${u}:****@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`; mongoDBLogger.info(`Connecting to ${uri}`); - require('./db/mongodb'); - mongoDBLogger.succ('Connectivity confirmed'); + + mongo.then(() => { + mongoDBLogger.succ('Connectivity confirmed'); + }) + .catch(err => { + mongoDBLogger.error(err.message); + }); } function spawnWorkers(limit: number) { |