1 files changed, 29 insertions, 14 deletions

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()
     })
   }