Federate video update

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

diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index 987e42eb074a0441fab5f2c43aa6d646ea0054c6..169b80065693cfcbf44f7ab874bb775681fbdca5 100644 (file)
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -1,11 +1,10 @@
 // TODO: import from ES6 when retry typing file will include errorFilter function
 import * as retry from 'async/retry'
-import * as Promise from 'bluebird'
-
+import * as Bluebird from 'bluebird'
 import { logger } from './logger'
 
 type RetryTransactionWrapperOptions = { errorMessage: string, arguments?: any[] }
-function retryTransactionWrapper (functionToRetry: (... args) => Promise<any>, options: RetryTransactionWrapperOptions) {
+function retryTransactionWrapper (functionToRetry: (...args) => Promise<any> | Bluebird<any>, options: RetryTransactionWrapperOptions) {
   const args = options.arguments ? options.arguments : []
 
   return transactionRetryer(callback => {
@@ -14,8 +13,8 @@ function retryTransactionWrapper (functionToRetry: (... args) => Promise<any>, o
         .catch(err => callback(err))
   })
   .catch(err => {
-    // Do not throw the error, continue the process
     logger.error(options.errorMessage, err)
+    throw err
   })
 }
 
@@ -29,7 +28,7 @@ function transactionRetryer (func: Function) {
         logger.debug('Maybe retrying the transaction function.', { willRetry })
         return willRetry
       }
-    }, func, err => err ? rej(err) : res())
+    }, func, (err, data) => err ? rej(err) : res(data))
   })
 }