From ad0997adfb9e1e3b1ff54338d7558cf7b18440ea Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 7 Jul 2017 18:26:12 +0200
Subject: Fix error logging

---
 server/controllers/api/videos/abuse.ts     | 2 +-
 server/controllers/api/videos/blacklist.ts | 2 +-
 server/controllers/api/videos/index.ts     | 8 ++++----
 server/controllers/api/videos/rate.ts      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'server/controllers/api/videos')

diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts
index fcbd5465f..3b1b7f58e 100644
--- a/server/controllers/api/videos/abuse.ts
+++ b/server/controllers/api/videos/abuse.ts
@@ -90,7 +90,7 @@ function reportVideoAbuse (req: express.Request, res: express.Response) {
   })
   .then((videoInstance: VideoInstance) => logger.info('Abuse report for video %s created.', videoInstance.name))
   .catch(err => {
-    logger.debug('Cannot update the video.', { error: err })
+    logger.debug('Cannot update the video.', err)
     throw err
   })
 }
diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts
index e4be6f0f9..d8f2068ec 100644
--- a/server/controllers/api/videos/blacklist.ts
+++ b/server/controllers/api/videos/blacklist.ts
@@ -35,7 +35,7 @@ function addVideoToBlacklist (req: express.Request, res: express.Response, next:
   db.BlacklistedVideo.create(toCreate)
     .then(() => res.type('json').status(204).end())
     .catch(err => {
-      logger.error('Errors when blacklisting video ', { error: err })
+      logger.error('Errors when blacklisting video ', err)
       return next(err)
     })
 }
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index ed1f21d66..3532c753e 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -63,7 +63,7 @@ const storage = multer.diskStorage({
         cb(null, filename + '.' + extension)
       })
       .catch(err => {
-        logger.error('Cannot generate random string for file name.', { error: err })
+        logger.error('Cannot generate random string for file name.', err)
         throw err
       })
   }
@@ -304,7 +304,7 @@ function updateVideo (req: express.Request, res: express.Response) {
     logger.info('Video with name %s updated.', videoInstance.name)
   })
   .catch(err => {
-    logger.debug('Cannot update the video.', { error: err })
+    logger.debug('Cannot update the video.', err)
 
     // Force fields we want to update
     // If the transaction is retried, sequelize will think the object has not changed
@@ -333,7 +333,7 @@ function getVideo (req: express.Request, res: express.Response, next: express.Ne
         }
         return quickAndDirtyUpdateVideoToFriends(qaduParams)
       })
-      .catch(err => logger.error('Cannot add view to video %d.', videoInstance.id, { error: err }))
+      .catch(err => logger.error('Cannot add view to video %d.', videoInstance.id, err))
   } else {
     // Just send the event to our friends
     const eventParams = {
@@ -359,7 +359,7 @@ function removeVideo (req: express.Request, res: express.Response, next: express
   videoInstance.destroy()
     .then(() => res.type('json').status(204).end())
     .catch(err => {
-      logger.error('Errors when removed the video.', { error: err })
+      logger.error('Errors when removed the video.', err)
       return next(err)
     })
 }
diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts
index 3d119d98b..dfb5a450f 100644
--- a/server/controllers/api/videos/rate.ts
+++ b/server/controllers/api/videos/rate.ts
@@ -143,7 +143,7 @@ function rateVideo (req: express.Request, res: express.Response) {
   .then(() => logger.info('User video rate for video %s of user %s updated.', videoInstance.name, userInstance.username))
   .catch(err => {
     // This is just a debug because we will retry the insert
-    logger.debug('Cannot add the user video rate.', { error: err })
+    logger.debug('Cannot add the user video rate.', err)
     throw err
   })
 }
-- 
cgit v1.2.3