Merge branch 'develop' into shorter-URLs-channels-accounts

[github/Chocobozzz/PeerTube.git] / server.ts

diff --git a/server.ts b/server.ts
index 97dffe7567e6a9758ca61f1c81dd4f83374248aa..7aaf1e553626049518e46cdec1e84ec51f5454e0 100644 (file)
--- a/server.ts
+++ b/server.ts
@@ -127,6 +127,7 @@ import { PluginManager } from './server/lib/plugins/plugin-manager'
 import { LiveManager } from './server/lib/live-manager'
 import { HttpStatusCode } from './shared/core-utils/miscs/http-error-codes'
 import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache'
+import { ServerConfigManager } from '@server/lib/server-config-manager'
 
 // ----------- Command line -----------
 
@@ -262,7 +263,8 @@ async function startApplication () {
 
   await Promise.all([
     Emailer.Instance.checkConnection(),
-    JobQueue.Instance.init()
+    JobQueue.Instance.init(),
+    ServerConfigManager.Instance.init()
   ])
 
   // Caches initializations