:v:

17 files changed, 58 insertions, 34 deletions

diff --git a/src/api/models/access-token.ts b/src/api/models/access-token.ts
index f94df954d6..a242865473 100644
--- a/src/api/models/access-token.ts
+++ b/src/api/models/access-token.ts
@@ -1,4 +1,6 @@
-const collection = global.db.collection('access_tokens');
+import db from '../../db/mongodb';
+
+const collection = db.collection('access_tokens');
 
 collection.createIndex('token');
 collection.createIndex('hash');
diff --git a/src/api/models/app.ts b/src/api/models/app.ts
index 221a53906a..39bb6cfa60 100644
--- a/src/api/models/app.ts
+++ b/src/api/models/app.ts
@@ -1,4 +1,6 @@
-const collection = global.db.collection('apps');
+import db from '../../db/mongodb';
+
+const collection = db.collection('apps');
 
 collection.createIndex('name_id');
 collection.createIndex('name_id_lower');
diff --git a/src/api/models/appdata.ts b/src/api/models/appdata.ts
index 2d471c4347..8dab199fef 100644
--- a/src/api/models/appdata.ts
+++ b/src/api/models/appdata.ts
@@ -1 +1,3 @@
-export default global.db.collection('appdata');
+import db from '../../db/mongodb';
+
+export default db.collection('appdata');
diff --git a/src/api/models/auth-session.ts b/src/api/models/auth-session.ts
index 6dbe2fa70e..1ee8299f54 100644
--- a/src/api/models/auth-session.ts
+++ b/src/api/models/auth-session.ts
@@ -1 +1,3 @@
-export default global.db.collection('auth_sessions');
+import db from '../../db/mongodb';
+
+export default db.collection('auth_sessions');
diff --git a/src/api/models/drive-file.ts b/src/api/models/drive-file.ts
index 06ebf02005..cc49cf44c8 100644
--- a/src/api/models/drive-file.ts
+++ b/src/api/models/drive-file.ts
@@ -1,4 +1,6 @@
-export default global.db.collection('drive_files');
+import db from '../../db/mongodb';
+
+export default db.collection('drive_files');
 
 export function validateFileName(name: string): boolean {
 	return (
diff --git a/src/api/models/drive-folder.ts b/src/api/models/drive-folder.ts
index f345b3c340..44e6c6f5c5 100644
--- a/src/api/models/drive-folder.ts
+++ b/src/api/models/drive-folder.ts
@@ -1,4 +1,6 @@
-export default global.db.collection('drive_folders');
+import db from '../../db/mongodb';
+
+export default db.collection('drive_folders');
 
 export function isValidFolderName(name: string): boolean {
 	return (
diff --git a/src/api/models/drive-tag.ts b/src/api/models/drive-tag.ts
index 83c0a8f681..e4b044242b 100644
--- a/src/api/models/drive-tag.ts
+++ b/src/api/models/drive-tag.ts
@@ -1 +1,3 @@
-export default global.db.collection('drive_tags');
+import db from '../../db/mongodb';
+
+export default db.collection('drive_tags');
diff --git a/src/api/models/favorite.ts b/src/api/models/favorite.ts
index 6d9e7c72b3..448b007777 100644
--- a/src/api/models/favorite.ts
+++ b/src/api/models/favorite.ts
@@ -1 +1,3 @@
-export default global.db.collection('favorites');
+import db from '../../db/mongodb';
+
+export default db.collection('favorites');
diff --git a/src/api/models/following.ts b/src/api/models/following.ts
index f9d8a41c5e..d509c60d8c 100644
--- a/src/api/models/following.ts
+++ b/src/api/models/following.ts
@@ -1 +1,3 @@
-export default global.db.collection('following');
+import db from '../../db/mongodb';
+
+export default db.collection('following');
diff --git a/src/api/models/like.ts b/src/api/models/like.ts
index aa3bd75c1c..7c571b91cb 100644
--- a/src/api/models/like.ts
+++ b/src/api/models/like.ts
@@ -1 +1,3 @@
-export default global.db.collection('likes');
+import db from '../../db/mongodb';
+
+export default db.collection('likes');
diff --git a/src/api/models/messaging-history.ts b/src/api/models/messaging-history.ts
index 3505e94b57..a06a7dd386 100644
--- a/src/api/models/messaging-history.ts
+++ b/src/api/models/messaging-history.ts
@@ -1 +1,3 @@
-export default global.db.collection('messaging_histories');
+import db from '../../db/mongodb';
+
+export default db.collection('messaging_histories');
diff --git a/src/api/models/messaging-message.ts b/src/api/models/messaging-message.ts
index 0e900bda58..1e6865d45f 100644
--- a/src/api/models/messaging-message.ts
+++ b/src/api/models/messaging-message.ts
@@ -1 +1,3 @@
-export default global.db.collection('messaging_messages');
+import db from '../../db/mongodb';
+
+export default db.collection('messaging_messages');
diff --git a/src/api/models/post.ts b/src/api/models/post.ts
index bea92a5f61..04468dd2ae 100644
--- a/src/api/models/post.ts
+++ b/src/api/models/post.ts
@@ -1 +1,3 @@
-export default global.db.collection('posts');
+import db from '../../db/mongodb';
+
+export default db.collection('posts');
diff --git a/src/api/models/signin.ts b/src/api/models/signin.ts
index 896afaaf84..151a0359e9 100644
--- a/src/api/models/signin.ts
+++ b/src/api/models/signin.ts
@@ -1 +1,3 @@
-export default global.db.collection('signin');
+import db from '../../db/mongodb';
+
+export default db.collection('signin');
diff --git a/src/api/models/user.ts b/src/api/models/user.ts
index ac59e2bfc3..5645d38568 100644
--- a/src/api/models/user.ts
+++ b/src/api/models/user.ts
@@ -1,4 +1,6 @@
-const collection = global.db.collection('users');
+import db from '../../db/mongodb';
+
+const collection = db.collection('users');
 
 collection.createIndex('username');
 collection.createIndex('token');
diff --git a/src/db/mongodb.ts b/src/db/mongodb.ts
index e2b2479b49..ea810dba0c 100644
--- a/src/db/mongodb.ts
+++ b/src/db/mongodb.ts
@@ -1,8 +1,11 @@
-import * as mongodb from 'mongodb';
+const mongo = require('mongoskin');
 
-export default async function(): Promise<mongodb.Db> {
-	const uri = config.mongodb.user && config.mongodb.pass
-		? `mongodb://${config.mongodb.user}:${config.mongodb.pass}@${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`
-		: `mongodb://${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
-	return await mongodb.MongoClient.connect(uri);
-};
+import config from '../conf';
+
+const uri = config.mongodb.user && config.mongodb.pass
+	? `mongodb://${config.mongodb.user}:${config.mongodb.pass}@${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`
+	: `mongodb://${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;
+
+const db = mongo.db(uri, { native_parser: true });
+
+export default db;
diff --git a/src/index.ts b/src/index.ts
index b025463e38..0144887957 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -15,7 +15,6 @@ import * as chalk from 'chalk';
 import portUsed = require('tcp-port-used');
 import isRoot = require('is-root');
 import ProgressBar from './utils/cli/progressbar';
-import initdb from './db/mongodb';
 import LastCommitInfo from './utils/lastCommitInfo';
 import EnvironmentInfo from './utils/environmentInfo';
 import MachineInfo from './utils/machineInfo';
@@ -106,16 +105,8 @@ async function masterMain(): Promise<void> {
  * Init worker proccess
  */
 function workerMain(): void {
-	// Init mongo
-	initdb().then(db => {
-		global.db = db;
-
-		// start server
-		require('./server');
-	}, err => {
-		console.error(err);
-		process.exit(0);
-	});
+	// start server
+	require('./server');
 }
 
 /**
@@ -158,7 +149,7 @@ async function init(): Promise<InitResult> {
 	// Try to connect to MongoDB
 	let mongoDBLogger = new Logger('MongoDB');
 	try {
-		const db = await initdb();
+		const db = require('./db/mongodb').default;
 		mongoDBLogger.info('Successfully connected');
 		db.close();
 	} catch (e) {