X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.ts;h=f6794b89783536bf044e58858a335d3370e4ceb2;hb=73c0809326670867642f8a36f68d8564e0e406b5;hp=8f280f6c2a07ee3c69b2d958d3a4db42b86a023f;hpb=bc4c766aca72c2b09b555895452b9b3e25cd85fe;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.ts b/server.ts
index 8f280f6c2..f6794b897 100644
--- a/server.ts
+++ b/server.ts
@@ -27,13 +27,21 @@ const app = express()
 // ----------- Core checker -----------
 import { checkMissedConfig, checkFFmpeg, checkConfig } from './server/initializers/checker'
 
+// Do not use barrels because we don't want to load all modules here (we need to initialize database first)
+import { logger } from './server/helpers/logger'
+import { ACCEPT_HEADERS, API_VERSION, CONFIG, STATIC_PATHS } from './server/initializers/constants'
+
 const missed = checkMissedConfig()
 if (missed.length !== 0) {
-  throw new Error('Your configuration files miss keys: ' + missed)
+  logger.error('Your configuration files miss keys: ' + missed)
+  process.exit(-1)
 }
 
-import { ACCEPT_HEADERS, API_VERSION, CONFIG, STATIC_PATHS } from './server/initializers/constants'
 checkFFmpeg(CONFIG)
+  .catch(err => {
+    logger.error('Error in ffmpeg check.', { err })
+    process.exit(-1)
+  })
 
 const errorMessage = checkConfig()
 if (errorMessage !== null) {
@@ -41,8 +49,6 @@ if (errorMessage !== null) {
 }
 
 // ----------- Database -----------
-// Do not use barrels because we don't want to load all modules here (we need to initialize database first)
-import { logger } from './server/helpers/logger'
 
 // Initialize database and models
 import { initDatabaseModels } from './server/initializers/database'
@@ -88,11 +94,11 @@ app.use(morgan('combined', {
   stream: { write: logger.info.bind(logger) }
 }))
 // For body requests
+app.use(bodyParser.urlencoded({ extended: false }))
 app.use(bodyParser.json({
   type: [ 'application/json', 'application/*+json' ],
   limit: '500kb'
 }))
-app.use(bodyParser.urlencoded({ extended: false }))
 
 // ----------- Tracker -----------
 
@@ -104,11 +110,11 @@ const trackerServer = new TrackerServer({
 })
 
 trackerServer.on('error', function (err) {
-  logger.error(err)
+  logger.error('Error in websocket tracker.', err)
 })
 
 trackerServer.on('warning', function (err) {
-  logger.error(err)
+  logger.error('Warning in websocket tracker.', err)
 })
 
 const server = http.createServer(app)
@@ -116,7 +122,6 @@ const wss = new WebSocketServer({ server: server, path: '/tracker/socket' })
 wss.on('connection', function (ws) {
   trackerServer.onWebSocketConnection(ws)
 })
-wss.on('error', err => logger.error('Error in websocket server.', err))
 
 const onHttpRequest = trackerServer.onHttpRequest.bind(trackerServer)
 app.get('/tracker/announce', (req, res) => onHttpRequest(req, res, { action: 'announce' }))
@@ -159,8 +164,13 @@ app.use(function (req, res, next) {
 })
 
 app.use(function (err, req, res, next) {
-  logger.error(err, err)
-  res.sendStatus(err.status || 500)
+  let error = 'Unknown error.'
+  if (err) {
+    error = err.stack || err.message || err
+  }
+
+  logger.error('Error in controller.', { error })
+  return res.status(err.status || 500).end()
 })
 
 // ----------- Run -----------