Server: host -> hostname (host = hostname + port)

[github/Chocobozzz/PeerTube.git] / server / initializers / database.js

diff --git a/server/initializers/database.js b/server/initializers/database.js
index 830cc7dd8e455287e51f5af0be7cd0000745380c..0564e4e77fdd824c73ff21c3f0ffc504eec0f5a9 100644 (file)
--- a/server/initializers/database.js
+++ b/server/initializers/database.js
@@ -1,20 +1,28 @@
 'use strict'
 
-const config = require('config')
 const mongoose = require('mongoose')
 
+const constants = require('../initializers/constants')
 const logger = require('../helpers/logger')
 
-const dbname = 'peertube' + config.get('database.suffix')
-const host = config.get('database.host')
-const port = config.get('database.port')
+// Bootstrap models
+require('../models/application')
+require('../models/oauth-token')
+require('../models/user')
+require('../models/oauth-client')
+require('../models/video')
+// Request model needs Video model
+require('../models/pods')
+// Request model needs Pod model
+require('../models/request')
 
 const database = {
   connect: connect
 }
 
 function connect () {
-  mongoose.connect('mongodb://' + host + ':' + port + '/' + dbname)
+  mongoose.Promise = global.Promise
+  mongoose.connect('mongodb://' + constants.CONFIG.DATABASE.HOSTNAME + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME)
   mongoose.connection.on('error', function () {
     throw new Error('Mongodb connection error.')
   })