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

Server: add information why a friend request failed (status code)

pull/10/merge
Chocobozzz 2016-10-01 09:48:49 +02:00
parent 14ad0c276b
commit b91359055f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/models/request.js
View File

@ -96,7 +96,14 @@ function makeRequest (toPod, requestsToMake, callback) {
// The function fire some useful callbacks // The function fire some useful callbacks
requests.makeSecureRequest(params, function (err, res) { requests.makeSecureRequest(params, function (err, res) {
if (err || (res.statusCode !== 200 && res.statusCode !== 201 && res.statusCode !== 204)) { if (err || (res.statusCode !== 200 && res.statusCode !== 201 && res.statusCode !== 204)) {
logger.error('Error sending secure request to %s pod.', toPod.url, { error: err || new Error('Status code not 20x') }) logger.error(
'Error sending secure request to %s pod.',
toPod.url,
{
error: err || new Error('Status code not 20x'),
statusCode: res.statusCode
}
)
return callback(false) return callback(false)
} }
@ -160,12 +167,6 @@ function makeRequests () {
} }
makeRequest(toPod, requestToMake.datas, function (success) { makeRequest(toPod, requestToMake.datas, function (success) {
if (err) {
logger.error('Errors when sent request to %s.', toPod.url, { error: err })
// Do not stop the process just for one error
return callbackEach()
}
if (success === true) { if (success === true) {
logger.debug('Removing requests for %s pod.', toPodId, { requestsIds: requestToMake.ids }) logger.debug('Removing requests for %s pod.', toPodId, { requestsIds: requestToMake.ids })