X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.js;h=b2487b767c36faa614a40233ac0e0340bfd24833;hb=d5f345ed4cfac4e1fa84dcb4fce1cda4d32f9c73;hp=7503072af9be7b929ab64f2ad30e101dcae6e858;hpb=99fe265a5fc077cb66c322e7f3d191ff7110aea0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.js b/server.js
index 7503072af..b2487b767 100644
--- a/server.js
+++ b/server.js
@@ -20,7 +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()
+db.init(onDatabaseInitDone)
 
 // ----------- Checker -----------
 const checker = require('./server/initializers/checker')
@@ -29,6 +29,11 @@ const missed = checker.checkMissedConfig()
 if (missed.length !== 0) {
   throw new Error('Miss some configurations keys : ' + missed)
 }
+checker.checkFFmpeg(function (err) {
+  if (err) {
+    throw err
+  }
+})
 
 const errorMessage = checker.checkConfig()
 if (errorMessage !== null) {
@@ -37,8 +42,10 @@ 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 jobScheduler = require('./server/lib/jobs/job-scheduler')
 const routes = require('./server/controllers')
 
 // ----------- Command line -----------
@@ -118,25 +125,30 @@ 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)
+        // Activate job scheduler
+        jobScheduler.activate()
 
-      app.emit('ready')
+        logger.info('Server listening on port %d', port)
+        logger.info('Webserver: %s', constants.CONFIG.WEBSERVER.URL)
+
+        app.emit('ready')
+      })
     })
   })
-})
+}
 
 module.exports = app