4 files changed, 47 insertions, 26 deletions

diff --git a/lib/friends.js b/lib/friends.js
index b0086a38b..badf09c7d 100644
--- a/lib/friends.js
+++ b/lib/friends.js
@@ -30,8 +30,7 @@
   function addVideoToFriends (video) {
     // To avoid duplicates
     var id = video.name + video.magnetUri
-    // namePath is null
-    // TODO
+    // ensure namePath is null
     video.namePath = null
     PoolRequests.addRequest(id, 'add', video)
   }
@@ -51,13 +50,15 @@
     logger.info('Make friends!')
     fs.readFile(peertubeCrypto.getCertDir() + 'peertube.pub', 'utf8', function (err, cert) {
       if (err) {
-        logger.error('Cannot read public cert.', { error: err })
+        logger.error('Cannot read public cert.')
         return callback(err)
       }
 
       var urls = config.get('network.friends')
 
-      async.each(urls, computeForeignPodsList, function () {
+      async.each(urls, computeForeignPodsList, function (err) {
+        if (err) return callback(err)
+
         logger.debug('Pods scores computed.', { pods_score: pods_score })
         var pods_list = computeWinningPods(urls, pods_score)
         logger.debug('Pods that we keep computed.', { pods_to_keep: pods_list })
@@ -72,7 +73,8 @@
       // Let's give 1 point to the pod we ask the friends list
       pods_score[url] = 1
 
-      getForeignPodsList(url, function (foreign_pods_list) {
+      getForeignPodsList(url, function (err, foreign_pods_list) {
+        if (err) return callback(err)
         if (foreign_pods_list.length === 0) return callback()
 
         async.each(foreign_pods_list, function (foreign_pod, callback_each) {
@@ -108,7 +110,10 @@
 
       // Get the list of our videos to send to our new friends
       Videos.listOwned(function (err, videos_list) {
-        if (err) throw err
+        if (err) {
+          logger.error('Cannot get the list of videos we own.')
+          return callback(err)
+        }
 
         var data = {
           url: http + '://' + host + ':' + port,
@@ -145,7 +150,7 @@
             poolRequests.activate()
 
             if (err) {
-              logger.error('There was some errors when we wanted to make friends.', { error: err })
+              logger.error('There was some errors when we wanted to make friends.')
               return callback(err)
             }
 
@@ -212,8 +217,9 @@
     var path = '/api/' + constants.API_VERSION + '/pods'
 
     request.get(url + path, function (err, response, body) {
-      if (err) throw err
-      callback(JSON.parse(body))
+      if (err) return callback(err)
+
+      callback(null, JSON.parse(body))
     })
   }
 })()
diff --git a/lib/poolRequests.js b/lib/poolRequests.js
index f4ab434ad..ccc3489ab 100644
--- a/lib/poolRequests.js
+++ b/lib/poolRequests.js
@@ -44,7 +44,7 @@
     if (!callback) callback = function () {}
 
     Pods.list(function (err, pods) {
-      if (err) throw err
+      if (err) return callback(err)
 
       var params = {
         encrypt: true,
@@ -59,7 +59,7 @@
       } else if (type === 'remove') {
         params.path = '/api/' + constants.API_VERSION + '/remotevideos/remove'
       } else {
-        throw new Error('Unkown pool request type.')
+        return callback(new Error('Unkown pool request type.'))
       }
 
       var bad_pods = []
@@ -91,7 +91,10 @@
     logger.info('Making pool requests to friends.')
 
     PoolRequests.list(function (err, pool_requests) {
-      if (err) throw err
+      if (err) {
+        logger.error('Cannot get the list of pool requests.', { err: err })
+        return // Abort
+      }
 
       if (pool_requests.length === 0) return
 
@@ -114,7 +117,8 @@
           requests_to_make.remove.requests.push(pool_request.request)
           requests_to_make.remove.ids.push(pool_request._id)
         } else {
-          throw new Error('Unkown pool request type.')
+          logger.error('Unkown pool request type.', { request_type: pool_request.type })
+          return // abort
         }
 
         callback_each()
@@ -142,7 +146,10 @@
 
   function removeBadPods () {
     Pods.findBadPods(function (err, pods) {
-      if (err) throw err
+      if (err) {
+        logger.error('Cannot find bad pods.', { error: err })
+        return // abort
+      }
 
       if (pods.length === 0) return
 
@@ -150,15 +157,20 @@
       var ids = pluck(pods, '_id')
 
       Videos.removeAllRemotesOf(urls, function (err, r) {
-        if (err) logger.error('Cannot remove videos from a pod that we removing.', { error: err })
-        var videos_removed = r.result.n
-        logger.info('Removed %d videos.', videos_removed)
+        if (err) {
+          logger.error('Cannot remove videos from a pod that we removing.', { error: err })
+        } else {
+          var videos_removed = r.result.n
+          logger.info('Removed %d videos.', videos_removed)
+        }
 
         Pods.removeAllByIds(ids, function (err, r) {
-          if (err) logger.error('Cannot remove bad pods.', { error: err })
-
-          var pods_removed = r.result.n
-          logger.info('Removed %d pods.', pods_removed)
+          if (err) {
+            logger.error('Cannot remove bad pods.', { error: err })
+          } else {
+            var pods_removed = r.result.n
+            logger.info('Removed %d pods.', pods_removed)
+          }
         })
       })
     })
@@ -167,9 +179,12 @@
   function updatePodsScore (good_pods, bad_pods) {
     logger.info('Updating %d good pods and %d bad pods scores.', good_pods.length, bad_pods.length)
 
-    Pods.incrementScores(good_pods, constants.PODS_SCORE.BONUS)
+    Pods.incrementScores(good_pods, constants.PODS_SCORE.BONUS, function (err) {
+      if (err) logger.error('Cannot increment scores of good pods.')
+    })
+
     Pods.incrementScores(bad_pods, constants.PODS_SCORE.MALUS, function (err) {
-      if (err) throw err
+      if (err) logger.error('Cannot increment scores of bad pods.')
       removeBadPods()
     })
   }
diff --git a/lib/videos.js b/lib/videos.js
index 5d23070a7..0da7715c4 100644
--- a/lib/videos.js
+++ b/lib/videos.js
@@ -28,14 +28,14 @@
   function seedAllExisting (callback) {
     Videos.listOwned(function (err, videos_list) {
       if (err) {
-        logger.error('Cannot get list of the videos to seed.', { error: err })
+        logger.error('Cannot get list of the videos to seed.')
         return callback(err)
       }
 
       async.each(videos_list, function (video, each_callback) {
         seed(uploadDir + video.namePath, function (err) {
           if (err) {
-            logger.error('Cannot seed this video.', { error: err })
+            logger.error('Cannot seed this video.')
             return callback(err)
           }
 
diff --git a/lib/webtorrent.js b/lib/webtorrent.js
index d1ca3c9f2..d0db6e066 100644
--- a/lib/webtorrent.js
+++ b/lib/webtorrent.js
@@ -62,7 +62,7 @@
       try {
         wt.remove(magnetUri, callback)
       } catch (err) {
-        console.log('Cannot remove the torrent from WebTorrent')
+        console.log('Cannot remove the torrent from WebTorrent.')
         return callback(null)
       }