X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.ts;h=7bab18b0cdcdc4370341e2449a222b4e71f7aa58;hb=38b4e733d2a11bf0e9164bc178f01cb18b15f6bd;hp=63a08f4713738a60e6ea9d35d296580b59cca403;hpb=37a04703a4b9829cb9aef6c5bb8835d2fa2f2fbc;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.ts b/server.ts
index 63a08f471..7bab18b0c 100644
--- a/server.ts
+++ b/server.ts
@@ -45,14 +45,24 @@ try {
 
 import { checkConfig, checkActivityPubUrls, checkFFmpegVersion } from './server/initializers/checker-after-init'
 
-checkConfig()
+try {
+  checkConfig()
+} catch (err) {
+  logger.error('Config error.', { err })
+  process.exit(-1)
+}
 
 // Trust our proxy (IP forwarding...)
 app.set('trust proxy', CONFIG.TRUST_PROXY)
 
 app.use((_req, res, next) => {
+  // OpenTelemetry
   res.locals.requestStart = Date.now()
 
+  if (CONFIG.SECURITY.POWERED_BY_HEADER.ENABLED === true) {
+    res.setHeader('x-powered-by', 'PeerTube')
+  }
+
   return next()
 })
 
@@ -102,9 +112,8 @@ import {
   wellKnownRouter,
   lazyStaticRouter,
   servicesRouter,
-  liveRouter,
+  objectStorageProxyRouter,
   pluginsRouter,
-  webfingerRouter,
   trackerRouter,
   createWebsocketTrackerServer,
   botsRouter,
@@ -221,15 +230,11 @@ app.use(apiRoute, apiRouter)
 // Services (oembed...)
 app.use('/services', servicesRouter)
 
-// Live streaming
-app.use('/live', liveRouter)
-
 // Plugins & themes
 app.use('/', pluginsRouter)
 
 app.use('/', activityPubRouter)
 app.use('/', feedsRouter)
-app.use('/', webfingerRouter)
 app.use('/', trackerRouter)
 app.use('/', botsRouter)
 
@@ -239,6 +244,7 @@ app.use('/', wellKnownRouter)
 app.use('/', miscRouter)
 app.use('/', downloadRouter)
 app.use('/', lazyStaticRouter)
+app.use('/', objectStorageProxyRouter)
 
 // Client files, last valid routes!
 const cliOptions = cli.opts<{ client: boolean, plugins: boolean }>()
@@ -276,7 +282,7 @@ app.use((err, _req, res: express.Response, _next) => {
   })
 })
 
-const server = createWebsocketTrackerServer(app)
+const { server, trackerServer } = createWebsocketTrackerServer(app)
 
 // ----------- Run -----------
 
@@ -325,7 +331,12 @@ async function startApplication () {
   VideoChannelSyncLatestScheduler.Instance.enable()
   VideoViewsBufferScheduler.Instance.enable()
   GeoIPUpdateScheduler.Instance.enable()
-  OpenTelemetryMetrics.Instance.registerMetrics()
+
+  OpenTelemetryMetrics.Instance.registerMetrics({ trackerServer })
+
+  PluginManager.Instance.init(server)
+  // Before PeerTubeSocket init
+  PluginManager.Instance.registerWebSocketRouter()
 
   PeerTubeSocket.Instance.init(server)
   VideoViewsManager.Instance.init()
@@ -351,6 +362,12 @@ async function startApplication () {
     ApplicationModel.updateNodeVersions()
       .catch(err => logger.error('Cannot update node versions.', { err }))
 
+    JobQueue.Instance.start()
+      .catch(err => {
+        logger.error('Cannot start job queue.', { err })
+        process.exit(-1)
+      })
+
     logger.info('HTTP server listening on %s:%d', hostname, port)
     logger.info('Web server: %s', WEBSERVER.URL)