yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 18:29:27 +02:00
Code Issues Releases Wiki Activity

Server: do not break remote videos processing on error

Browse source
This commit is contained in:
Chocobozzz 2017-01-11 18:06:51 +01:00
parent dea32aacde
commit d8cc063e97
3 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
server/controllers/api/remote/videos.js
View file

@ -73,10 +73,10 @@ function addRemoteVideoRetryWrapper (videoToCreateData, fromPod, finalCallback)
function (err) {
if (err) {
logger.error('Cannot insert the remote video with many retries.', { error: err })
return finalCallback(err)
}
return finalCallback()
// Do not return the error, continue the process
return finalCallback(null)
}
)
}
@ -174,7 +174,7 @@ function addRemoteVideo (videoToCreateData, fromPod, finalCallback) {
t.commit().asCallback(function (err) {
if (err) return finalCallback(err)
logger.info('Remote video %s inserted.', videoToCreateData.videoToCreateData.name)
logger.info('Remote video %s inserted.', videoToCreateData.name)
return finalCallback(null)
})
})
@ -189,10 +189,10 @@ function updateRemoteVideoRetryWrapper (videoAttributesToUpdate, fromPod, finalC
function (err) {
if (err) {
logger.error('Cannot update the remote video with many retries.', { error: err })
return finalCallback(err)
}
return finalCallback()
// Do not return the error, continue the process
return finalCallback(null)
}
)
}
@ -270,10 +270,18 @@ function updateRemoteVideo (videoAttributesToUpdate, fromPod, finalCallback) {
function removeRemoteVideo (videoToRemoveData, fromPod, callback) {
// We need the instance because we have to remove some other stuffs (thumbnail etc)
fetchVideo(fromPod.host, videoToRemoveData.remoteId, function (err, video) {
if (err) return callback(err)
// Do not return the error, continue the process
if (err) return callback(null)
logger.debug('Removing remote video %s.', video.remoteId)
video.destroy().asCallback(callback)
video.destroy().asCallback(function (err) {
// Do not return the error, continue the process
if (err) {
logger.error('Cannot remove remote video with id %s.', videoToRemoveData.remoteId, { error: err })
}
return callback(null)
})
})
}
@ -283,7 +291,8 @@ function reportAbuseRemoteVideo (reportData, fromPod, callback) {
if (!err) err = new Error('video not found')
logger.error('Cannot load video from id.', { error: err, id: reportData.videoRemoteId })
return callback(err)
// Do not return the error, continue the process
return callback(null)
}
logger.debug('Reporting remote abuse for video %s.', video.id)
@ -295,7 +304,13 @@ function reportAbuseRemoteVideo (reportData, fromPod, callback) {
videoId: video.id
}
db.VideoAbuse.create(videoAbuseData).asCallback(callback)
db.VideoAbuse.create(videoAbuseData).asCallback(function (err) {
if (err) {
logger.error('Cannot create remote abuse video.', { error: err })
}
return callback(null)
})
})
}