X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.js;h=33d399786da00edd0f787ee8cba3b7819ed09ba9;hb=3eeeb87fe62fab3e48455f53c8a725b49878b9b3;hp=e54ffe69f7632f0dfcec9b8979c92b6dd878d4b3;hpb=feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.js b/server.js
index e54ffe69f..33d399786 100644
--- a/server.js
+++ b/server.js
@@ -20,6 +20,7 @@ const constants = require('./server/initializers/constants')
 const logger = require('./server/helpers/logger')
 // Initialize database and models
 const db = require('./server/initializers/database')
+db.init(onDatabaseInitDone)
 
 // ----------- Checker -----------
 const checker = require('./server/initializers/checker')
@@ -36,6 +37,7 @@ if (errorMessage !== null) {
 
 // ----------- PeerTube modules -----------
 const customValidators = require('./server/helpers/custom-validators')
+const friends = require('./server/lib/friends')
 const installer = require('./server/initializers/installer')
 const migrator = require('./server/initializers/migrator')
 const routes = require('./server/controllers')
@@ -56,7 +58,8 @@ app.use(expressValidator({
     customValidators.misc,
     customValidators.pods,
     customValidators.users,
-    customValidators.videos
+    customValidators.videos,
+    customValidators.remote.videos
   )
 }))
 
@@ -116,25 +119,27 @@ app.use(function (err, req, res, next) {
 
 // ----------- Run -----------
 
-const port = constants.CONFIG.LISTEN.PORT
-installer.installApplication(function (err) {
-  if (err) throw err
-
-  // Run the migration scripts if needed
+function onDatabaseInitDone () {
+  const port = constants.CONFIG.LISTEN.PORT
+    // Run the migration scripts if needed
   migrator.migrate(function (err) {
     if (err) throw err
 
-    // ----------- Make the server listening -----------
-    server.listen(port, function () {
-      // Activate the pool requests
-      db.Request.activate()
+    installer.installApplication(function (err) {
+      if (err) throw err
+
+      // ----------- Make the server listening -----------
+      server.listen(port, function () {
+        // Activate the communication with friends
+        friends.activate()
 
-      logger.info('Server listening on port %d', port)
-      logger.info('Webserver: %s', constants.CONFIG.WEBSERVER.URL)
+        logger.info('Server listening on port %d', port)
+        logger.info('Webserver: %s', constants.CONFIG.WEBSERVER.URL)
 
-      app.emit('ready')
+        app.emit('ready')
+      })
     })
   })
-})
+}
 
 module.exports = app