Refractor retry transaction function

1 files changed, 34 insertions, 15 deletions

diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index b3ff42a37..9b861a88c 100644
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -3,35 +3,54 @@ import * as Bluebird from 'bluebird'
 import { Model } from 'sequelize-typescript'
 import { logger } from './logger'
 
-type RetryTransactionWrapperOptions = { errorMessage: string, arguments?: any[] }
+function retryTransactionWrapper <T, A, B, C> (
+  functionToRetry: (arg1: A, arg2: B, arg3: C) => Promise<T> | Bluebird<T>,
+  arg1: A,
+  arg2: B,
+  arg3: C
+): Promise<T>
+
+function retryTransactionWrapper <T, A, B> (
+  functionToRetry: (arg1: A, arg2: B) => Promise<T> | Bluebird<T>,
+  arg1: A,
+  arg2: B
+): Promise<T>
+
+function retryTransactionWrapper <T, A> (
+  functionToRetry: (arg1: A) => Promise<T> | Bluebird<T>,
+  arg1: A
+): Promise<T>
+
 function retryTransactionWrapper <T> (
-  functionToRetry: (...args) => Promise<T> | Bluebird<T>,
-  options: RetryTransactionWrapperOptions
+  functionToRetry: (...args: any[]) => Promise<T> | Bluebird<T>,
+  ...args: any[]
 ): Promise<T> {
-  const args = options.arguments ? options.arguments : []
-
   return transactionRetryer<T>(callback => {
     functionToRetry.apply(this, args)
         .then((result: T) => callback(null, result))
         .catch(err => callback(err))
   })
   .catch(err => {
-    logger.error(options.errorMessage, { err })
+    logger.error('Cannot execute %s with many retries.', functionToRetry.toString(), { err })
     throw err
   })
 }
 
 function transactionRetryer <T> (func: (err: any, data: T) => any) {
   return new Promise<T>((res, rej) => {
-    retry({
-      times: 5,
-
-      errorFilter: err => {
-        const willRetry = (err.name === 'SequelizeDatabaseError')
-        logger.debug('Maybe retrying the transaction function.', { willRetry, err })
-        return willRetry
-      }
-    }, func, (err, data) => err ? rej(err) : res(data))
+    retry(
+      {
+        times: 5,
+
+        errorFilter: err => {
+          const willRetry = (err.name === 'SequelizeDatabaseError')
+          logger.debug('Maybe retrying the transaction function.', { willRetry, err })
+          return willRetry
+        }
+      },
+      func,
+      (err, data) => err ? rej(err) : res(data)
+    )
   })
 }