Fix error logging

7 files changed, 20 insertions, 20 deletions

diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts
index 0f85ab51d..55a7df661 100644
--- a/server/controllers/api/pods.ts
+++ b/server/controllers/api/pods.ts
@@ -81,7 +81,7 @@ function makeFriendsController (req: express.Request, res: express.Response, nex
 
   makeFriends(hosts)
     .then(() => logger.info('Made friends!'))
-    .catch(err => logger.error('Could not make friends.', { error: err }))
+    .catch(err => logger.error('Could not make friends.', err))
 
   // Don't wait the process that could be long
   res.type('json').status(204).end()
diff --git a/server/controllers/api/remote/videos.ts b/server/controllers/api/remote/videos.ts
index eb033637e..fac85c3a8 100644
--- a/server/controllers/api/remote/videos.ts
+++ b/server/controllers/api/remote/videos.ts
@@ -76,7 +76,7 @@ function remoteVideos (req: express.Request, res: express.Response, next: expres
 
     return fun.call(this, data, fromPod)
   })
-  .catch(err => logger.error('Error managing remote videos.', { error: err }))
+  .catch(err => logger.error('Error managing remote videos.', err))
 
   // Don't block the other pod
   return res.type('json').status(204).end()
@@ -91,7 +91,7 @@ function remoteVideosQadu (req: express.Request, res: express.Response, next: ex
 
     return quickAndDirtyUpdateVideoRetryWrapper(videoData, fromPod)
   })
-  .catch(err => logger.error('Error managing remote videos.', { error: err }))
+  .catch(err => logger.error('Error managing remote videos.', err))
 
   return res.type('json').status(204).end()
 }
@@ -105,7 +105,7 @@ function remoteVideosEvents (req: express.Request, res: express.Response, next:
 
     return processVideosEventsRetryWrapper(eventData, fromPod)
   })
-  .catch(err => logger.error('Error managing remote videos.', { error: err }))
+  .catch(err => logger.error('Error managing remote videos.', err))
 
   return res.type('json').status(204).end()
 }
@@ -167,7 +167,7 @@ function processVideosEvents (eventData: any, fromPod: PodInstance) {
   })
   .then(() => logger.info('Remote video event processed for video %s.', eventData.remoteId))
   .catch(err => {
-    logger.debug('Cannot process a video event.', { error: err })
+    logger.debug('Cannot process a video event.', err)
     throw err
   })
 }
@@ -207,7 +207,7 @@ function quickAndDirtyUpdateVideo (videoData: any, fromPod: PodInstance) {
       })
   })
   .then(() => logger.info('Remote video %s quick and dirty updated', videoName))
-  .catch(err => logger.debug('Cannot quick and dirty update the remote video.', { error: err }))
+  .catch(err => logger.debug('Cannot quick and dirty update the remote video.', err))
 }
 
 // Handle retries on fail
@@ -287,7 +287,7 @@ function addRemoteVideo (videoToCreateData: any, fromPod: PodInstance) {
   })
   .then(() => logger.info('Remote video %s inserted.', videoToCreateData.name))
   .catch(err => {
-    logger.debug('Cannot insert the remote video.', { error: err })
+    logger.debug('Cannot insert the remote video.', err)
     throw err
   })
 }
@@ -341,7 +341,7 @@ function updateRemoteVideo (videoAttributesToUpdate: any, fromPod: PodInstance)
   .then(() => logger.info('Remote video %s updated', videoAttributesToUpdate.name))
   .catch(err => {
     // This is just a debug because we will retry the insert
-    logger.debug('Cannot update the remote video.', { error: err })
+    logger.debug('Cannot update the remote video.', err)
     throw err
   })
 }
@@ -354,7 +354,7 @@ function removeRemoteVideo (videoToRemoveData: any, fromPod: PodInstance) {
       return video.destroy()
     })
     .catch(err => {
-      logger.debug('Could not fetch remote video.', { host: fromPod.host, remoteId: videoToRemoveData.remoteId, error: err })
+      logger.debug('Could not fetch remote video.', { host: fromPod.host, remoteId: videoToRemoveData.remoteId, error: err.stack })
     })
 }
 
@@ -372,7 +372,7 @@ function reportAbuseRemoteVideo (reportData: any, fromPod: PodInstance) {
 
       return db.VideoAbuse.create(videoAbuseData)
     })
-    .catch(err => logger.error('Cannot create remote abuse video.', { error: err }))
+    .catch(err => logger.error('Cannot create remote abuse video.', err))
 }
 
 function fetchOwnedVideo (id: string) {
@@ -383,7 +383,7 @@ function fetchOwnedVideo (id: string) {
       return video
     })
     .catch(err => {
-      logger.error('Cannot load owned video from id.', { error: err, id })
+      logger.error('Cannot load owned video from id.', { error: err.stack, id })
       throw err
     })
 }
@@ -396,7 +396,7 @@ function fetchRemoteVideo (podHost: string, remoteId: string) {
       return video
     })
     .catch(err => {
-      logger.error('Cannot load video from host and remote id.', { error: err, podHost, remoteId })
+      logger.error('Cannot load video from host and remote id.', { error: err.stack, podHost, remoteId })
       throw err
     })
 }
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index 6e0bb474a..845facd55 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -126,7 +126,7 @@ function removeUser (req: express.Request, res: express.Response, next: express.
     .then(user => user.destroy())
     .then(() => res.sendStatus(204))
     .catch(err => {
-      logger.error('Errors when removed the user.', { error: err })
+      logger.error('Errors when removed the user.', err)
       return next(err)
     })
 }
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
   })
 }