diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-08-22 09:16:55 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-08-22 09:16:55 +0900 |
| commit | 58082431ffd3313fead7bbd05334e00bbd5d5add (patch) | |
| tree | a61cf5d6ee9a0a6f0555dd21cddcaee2c181db44 /src | |
| parent | #2378 (diff) | |
| parent | Merge pull request #2388 from mei23/mei-0822-dbcheck (diff) | |
| download | sharkey-58082431ffd3313fead7bbd05334e00bbd5d5add.tar.gz sharkey-58082431ffd3313fead7bbd05334e00bbd5d5add.tar.bz2 sharkey-58082431ffd3313fead7bbd05334e00bbd5d5add.zip | |
Merge branch 'master' of https://github.com/syuilo/misskey
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) { |