aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-06-13 14:27:40 +0200
committerChocobozzz <me@florianbigard.com>2018-06-13 14:27:40 +0200
commit90d4bb8125e80c8060416d4d135ddeaf0a622ede (patch)
treeb3b7181329a08ecc930b54fe7b48095c4155393c /server/helpers
parent3cd0734fd9b0ff21aaef02317a874e8f1c06e027 (diff)
downloadPeerTube-90d4bb8125e80c8060416d4d135ddeaf0a622ede.tar.gz
PeerTube-90d4bb8125e80c8060416d4d135ddeaf0a622ede.tar.zst
PeerTube-90d4bb8125e80c8060416d4d135ddeaf0a622ede.zip
Refractor retry transaction function
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/database-utils.ts49
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'
3import { Model } from 'sequelize-typescript' 3import { Model } from 'sequelize-typescript'
4import { logger } from './logger' 4import { logger } from './logger'
5 5
6type RetryTransactionWrapperOptions = { errorMessage: string, arguments?: any[] } 6function retryTransactionWrapper <T, A, B, C> (
7 functionToRetry: (arg1: A, arg2: B, arg3: C) => Promise<T> | Bluebird<T>,
8 arg1: A,
9 arg2: B,
10 arg3: C
11): Promise<T>
12
13function retryTransactionWrapper <T, A, B> (
14 functionToRetry: (arg1: A, arg2: B) => Promise<T> | Bluebird<T>,
15 arg1: A,
16 arg2: B
17): Promise<T>
18
19function retryTransactionWrapper <T, A> (
20 functionToRetry: (arg1: A) => Promise<T> | Bluebird<T>,
21 arg1: A
22): Promise<T>
23
7function retryTransactionWrapper <T> ( 24function retryTransactionWrapper <T> (
8 functionToRetry: (...args) => Promise<T> | Bluebird<T>, 25 functionToRetry: (...args: any[]) => Promise<T> | Bluebird<T>,
9 options: RetryTransactionWrapperOptions 26 ...args: any[]
10): Promise<T> { 27): Promise<T> {
11 const args = options.arguments ? options.arguments : []
12
13 return transactionRetryer<T>(callback => { 28 return transactionRetryer<T>(callback => {
14 functionToRetry.apply(this, args) 29 functionToRetry.apply(this, args)
15 .then((result: T) => callback(null, result)) 30 .then((result: T) => callback(null, result))
16 .catch(err => callback(err)) 31 .catch(err => callback(err))
17 }) 32 })
18 .catch(err => { 33 .catch(err => {
19 logger.error(options.errorMessage, { err }) 34 logger.error('Cannot execute %s with many retries.', functionToRetry.toString(), { err })
20 throw err 35 throw err
21 }) 36 })
22} 37}
23 38
24function transactionRetryer <T> (func: (err: any, data: T) => any) { 39function transactionRetryer <T> (func: (err: any, data: T) => any) {
25 return new Promise<T>((res, rej) => { 40 return new Promise<T>((res, rej) => {
26 retry({ 41 retry(
27 times: 5, 42 {
28 43 times: 5,
29 errorFilter: err => { 44
30 const willRetry = (err.name === 'SequelizeDatabaseError') 45 errorFilter: err => {
31 logger.debug('Maybe retrying the transaction function.', { willRetry, err }) 46 const willRetry = (err.name === 'SequelizeDatabaseError')
32 return willRetry 47 logger.debug('Maybe retrying the transaction function.', { willRetry, err })
33 } 48 return willRetry
34 }, func, (err, data) => err ? rej(err) : res(data)) 49 }
50 },
51 func,
52 (err, data) => err ? rej(err) : res(data)
53 )
35 }) 54 })
36} 55}
37 56