X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.js;h=0564e4e77fdd824c73ff21c3f0ffc504eec0f5a9;hb=41b5da1d8cb41f5c49f0e0a01a54106c9a5925dd;hp=a917442ec877231d88d6d114368509894e244f1d;hpb=b9a3e09ad5a7673f64556d1dba122ed4c4fac980;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.js b/server/initializers/database.js
index a917442ec..0564e4e77 100644
--- a/server/initializers/database.js
+++ b/server/initializers/database.js
@@ -1,20 +1,28 @@
 'use strict'
 
-var config = require('config')
-var mongoose = require('mongoose')
-
-var logger = require('../helpers/logger')
-
-var dbname = 'peertube' + config.get('database.suffix')
-var host = config.get('database.host')
-var port = config.get('database.port')
-
-var database = {
+const mongoose = require('mongoose')
+
+const constants = require('../initializers/constants')
+const logger = require('../helpers/logger')
+
+// 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.')
   })