Add context menu to player

[github/Chocobozzz/PeerTube.git] / server / helpers / database-utils.ts

diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index 78ca768b91d491b870753f34da724afd41a91ae9..b3ff42a37b2c68541dd503d008e3f66d1c48f741 100644 (file)
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -16,7 +16,7 @@ function retryTransactionWrapper <T> (
         .catch(err => callback(err))
   })
   .catch(err => {
-    logger.error(options.errorMessage, err)
+    logger.error(options.errorMessage, { err })
     throw err
   })
 }
@@ -28,14 +28,14 @@ function transactionRetryer <T> (func: (err: any, data: T) => any) {
 
       errorFilter: err => {
         const willRetry = (err.name === 'SequelizeDatabaseError')
-        logger.debug('Maybe retrying the transaction function.', { willRetry })
+        logger.debug('Maybe retrying the transaction function.', { willRetry, err })
         return willRetry
       }
     }, func, (err, data) => err ? rej(err) : res(data))
   })
 }
 
-function updateInstanceWithAnother <T> (instanceToUpdate: Model<T>, baseInstance: Model<T>) {
+function updateInstanceWithAnother <T extends Model<T>> (instanceToUpdate: Model<T>, baseInstance: Model<T>) {
   const obj = baseInstance.toJSON()
 
   for (const key of Object.keys(obj)) {