X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=server.js;h=b8674b0b52c80b6e30a7cac8722818ee2ca131c1;hb=dac0a5319ab1c52a0958647b1593f85339b77e29;hp=1e0222f4f1dfd3615405b35df09a40b7185b3579;hpb=cda021079ff455cc0fd0eb95a5395fa808ab63d1;p=oweals%2Fpeertube.git

diff --git a/server.js b/server.js
index 1e0222f4f..b8674b0b5 100644
--- a/server.js
+++ b/server.js
@@ -30,16 +30,21 @@
   var config = require('config')
   var constants = require('./initializers/constants')
   var customValidators = require('./helpers/customValidators')
+  var database = require('./initializers/database')
   var logger = require('./helpers/logger')
+  var peertubeCrypto = require('./helpers/peertubeCrypto')
   var poolRequests = require('./lib/poolRequests')
   var routes = require('./controllers')
   var utils = require('./helpers/utils')
-  var videos = require('./models/videos')
+  var videos = require('./lib/videos')
   var webtorrent = require('./lib/webTorrentNode')
 
   // Get configurations
   var port = config.get('listen.port')
 
+  // ----------- Database -----------
+  database.connect()
+
   // ----------- Command line -----------
 
   // ----------- App -----------
@@ -113,7 +118,7 @@
   // Prod : no stacktraces leaked to user
   if (process.env.NODE_ENV === 'production') {
     app.use(function (err, req, res, next) {
-      logger.error('Error : ' + err.message, { error: err })
+      logger.error(err)
       res.status(err.status || 500)
       res.render('error', {
         message: err.message,
@@ -122,7 +127,7 @@
     })
   } else {
     app.use(function (err, req, res, next) {
-      logger.error('Error : ' + err.message, { error: err })
+      logger.error(err)
       res.status(err.status || 500)
       res.render('error', {
         message: err.message,
@@ -132,7 +137,7 @@
   }
 
   // ----------- Create the certificates if they don't already exist -----------
-  utils.createCertsIfNotExist(function (err) {
+  peertubeCrypto.createCertsIfNotExist(function (err) {
     if (err) throw err
     // Create/activate the webtorrent module
     webtorrent.create(function () {
@@ -153,7 +158,7 @@
         // Activate the pool requests
         poolRequests.activate()
 
-        videos.seedAll(function () {
+        videos.seedAllExisting(function () {
           logger.info('Seeded all the videos')
           logger.info('Server listening on port %d', port)
           app.emit('ready')