OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crash with websocket tracker

pull/285/head
Chocobozzz 2018-02-09 13:15:40 +01:00
parent 53ac1448f0
commit 1e9d7b60cd
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server.ts
View File

@ -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' }))

4
server/helpers/logger.ts
View File

@ -26,12 +26,12 @@ const loggerFormat = winston.format.printf((info) => {
if (additionalInfos === '{}') additionalInfos = ''
else additionalInfos = ' ' + additionalInfos
if (info.message.stack !== undefined) info.message = info.message.stack
if (info.message && info.message.stack !== undefined) info.message = info.message.stack
return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message}${additionalInfos}`
})
const timestampFormatter = winston.format.timestamp({
format: 'YYYY-MM-DD hh:mm:ss.SSS'
format: 'YYYY-MM-dd HH:mm:ss.SSS'
})
const labelFormatter = winston.format.label({
label