Error handling mini refractoring

[github/Chocobozzz/PeerTube.git] / controllers / api / v1 / pods.js

diff --git a/controllers/api/v1/pods.js b/controllers/api/v1/pods.js
index 82d8d7f08571b8e9b3ffcda0a99f1a37bc43aa10..456f53dea0fb88be4fa491412f91f477985c18ca 100644 (file)
--- a/controllers/api/v1/pods.js
+++ b/controllers/api/v1/pods.js
@@ -7,21 +7,22 @@
   var logger = require('../../../helpers/logger')
   var friends = require('../../../lib/friends')
   var middleware = require('../../../middlewares')
-  var miscMiddleware = middleware.misc
+  var cacheMiddleware = middleware.cache
+  var peertubeCrypto = require('../../../helpers/peertubeCrypto')
   var Pods = require('../../../models/pods')
   var reqValidator = middleware.reqValidators.pods
+  var secureMiddleware = middleware.secure
   var secureRequest = middleware.reqValidators.remote.secureRequest
-  var utils = require('../../../helpers/utils')
   var Videos = require('../../../models/videos')
 
   var router = express.Router()
 
-  router.get('/', miscMiddleware.cache(false), listPods)
-  router.post('/', reqValidator.podsAdd, miscMiddleware.cache(false), addPods)
-  router.get('/makefriends', reqValidator.makeFriends, miscMiddleware.cache(false), makeFriends)
-  router.get('/quitfriends', miscMiddleware.cache(false), quitFriends)
+  router.get('/', cacheMiddleware.cache(false), listPods)
+  router.post('/', reqValidator.podsAdd, cacheMiddleware.cache(false), addPods)
+  router.get('/makefriends', reqValidator.makeFriends, cacheMiddleware.cache(false), makeFriends)
+  router.get('/quitfriends', cacheMiddleware.cache(false), quitFriends)
   // Post because this is a secured request
-  router.post('/remove', secureRequest, miscMiddleware.decryptBody, removePods)
+  router.post('/remove', secureRequest, secureMiddleware.decryptBody, removePods)
 
   // ---------------------------------------------------------------------------
 
@@ -36,15 +37,15 @@
 
       Videos.addRemotes(informations.videos)
 
-      fs.readFile(utils.getCertDir() + 'peertube.pub', 'utf8', function (err, cert) {
+      fs.readFile(peertubeCrypto.getCertDir() + 'peertube.pub', 'utf8', function (err, cert) {
         if (err) {
-          logger.error('Cannot read cert file.', { error: err })
+          logger.error('Cannot read cert file.')
           return next(err)
         }
 
         Videos.listOwned(function (err, videos_list) {
           if (err) {
-            logger.error('Cannot get the list of owned videos.', { error: err })
+            logger.error('Cannot get the list of owned videos.')
             return next(err)
           }
 
@@ -77,7 +78,8 @@
 
       Videos.removeAllRemotesOf(url, function (err) {
         if (err) logger.error('Cannot remove all remote videos of %s.', url)
-        logger.info('%s pod removed.', url)
+        else logger.info('%s pod removed.', url)
+
         res.sendStatus(204)
       })
     })