Error handling mini refractoring

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

diff --git a/controllers/api/v1/videos.js b/controllers/api/v1/videos.js
index d2e7e8825221ee02bf65928b71ea3524dddbced9..eec95c8018e762d7200728d15c9eeed1f9a08d07 100644 (file)
--- a/controllers/api/v1/videos.js
+++ b/controllers/api/v1/videos.js
@@ -9,7 +9,7 @@
   var logger = require('../../../helpers/logger')
   var friends = require('../../../lib/friends')
   var middleware = require('../../../middlewares')
-  var miscMiddleware = middleware.misc
+  var cacheMiddleware = middleware.cache
   var reqValidator = middleware.reqValidators.videos
   var Videos = require('../../../models/videos') // model
   var videos = require('../../../lib/videos')
@@ -38,11 +38,11 @@
 
   var reqFiles = multer({ storage: storage }).fields([{ name: 'input_video', maxCount: 1 }])
 
-  router.get('/', miscMiddleware.cache(false), listVideos)
-  router.post('/', reqFiles, reqValidator.videosAdd, miscMiddleware.cache(false), addVideo)
-  router.get('/:id', reqValidator.videosGet, miscMiddleware.cache(false), getVideos)
-  router.delete('/:id', reqValidator.videosRemove, miscMiddleware.cache(false), removeVideo)
-  router.get('/search/:name', reqValidator.videosSearch, miscMiddleware.cache(false), searchVideos)
+  router.get('/', cacheMiddleware.cache(false), listVideos)
+  router.post('/', reqFiles, reqValidator.videosAdd, cacheMiddleware.cache(false), addVideo)
+  router.get('/:id', reqValidator.videosGet, cacheMiddleware.cache(false), getVideos)
+  router.delete('/:id', reqValidator.videosRemove, cacheMiddleware.cache(false), removeVideo)
+  router.get('/search/:name', reqValidator.videosSearch, cacheMiddleware.cache(false), searchVideos)
 
   // ---------------------------------------------------------------------------
 
@@ -56,7 +56,7 @@
 
     videos.seed(video_file.path, function (err, torrent) {
       if (err) {
-        logger.error('Cannot seed this video.', { error: err })
+        logger.error('Cannot seed this video.')
         return next(err)
       }
 
@@ -70,7 +70,7 @@
       Videos.add(video_data, function (err) {
         if (err) {
           // TODO unseed the video
-          logger.error('Cannot insert this video in the database.', { error: err })
+          logger.error('Cannot insert this video in the database.')
           return next(err)
         }