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

diff --git a/server.ts b/server.ts
index 8f280f6c2..c19ec4f19 100644
--- a/server.ts
+++ b/server.ts
@@ -104,11 +104,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 +116,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 +158,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 -----------