Server: add webserver url log at startup

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

diff --git a/server/initializers/checker.js b/server/initializers/checker.js
index 7a2b5b132450eebb2f2d82d4e27a2050bf09310b..4ecabac77fcf230fcd7cff857f10bd24ce2ae0b2 100644 (file)
--- a/server/initializers/checker.js
+++ b/server/initializers/checker.js
@@ -1,22 +1,24 @@
 'use strict'
 
 const config = require('config')
+const mongoose = require('mongoose')
 
-const Users = require('../models/users')
+const Client = mongoose.model('OAuthClient')
+const User = mongoose.model('User')
 
 const checker = {
-  checkConfig: checkConfig,
-  clientsExist: clientsExist,
-  usersExist: usersExist
+  checkConfig,
+  clientsExist,
+  usersExist
 }
 
 // Check the config files
 function checkConfig () {
   const required = [ 'listen.port',
-    'webserver.https', 'webserver.host', 'webserver.port',
-    'database.host', 'database.port', 'database.suffix',
-    'storage.certs', 'storage.uploads', 'storage.logs',
-    'network.friends', 'electron.debug' ]
+    'webserver.https', 'webserver.hostname', 'webserver.port',
+    'database.hostname', 'database.port', 'database.suffix',
+    'storage.certs', 'storage.videos', 'storage.logs', 'storage.thumbnails'
+  ]
   const miss = []
 
   for (const key of required) {
@@ -29,7 +31,7 @@ function checkConfig () {
 }
 
 function clientsExist (callback) {
-  Users.getClients(function (err, clients) {
+  Client.list(function (err, clients) {
     if (err) return callback(err)
 
     return callback(null, clients.length !== 0)
@@ -37,10 +39,10 @@ function clientsExist (callback) {
 }
 
 function usersExist (callback) {
-  Users.getUsers(function (err, users) {
+  User.countTotal(function (err, totalUsers) {
     if (err) return callback(err)
 
-    return callback(null, users.length !== 0)
+    return callback(null, totalUsers !== 0)
   })
 }