X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fdatabase-utils.ts;h=39c74b2fdec9d87e791abb3de9be7b44dbc19083;hb=e1a1f9c623bfbbc7e38b36047926338f2e1c61d9;hp=ededa79016fb3e3be8c79274eb390d5788805895;hpb=2baea0c77cc765f7cbca9c9a2f4272268892a35c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts index ededa7901..39c74b2fd 100644 --- a/server/helpers/database-utils.ts +++ b/server/helpers/database-utils.ts @@ -35,7 +35,7 @@ function retryTransactionWrapper ( .catch(err => callback(err)) }) .catch(err => { - logger.error('Cannot execute %s with many retries.', functionToRetry.toString(), { err }) + logger.error(`Cannot execute ${functionToRetry.name} with many retries.`, { err }) throw err }) } @@ -62,13 +62,20 @@ function updateInstanceWithAnother > (instanceToUpdate: Model const obj = baseInstance.toJSON() for (const key of Object.keys(obj)) { - instanceToUpdate.set(key, obj[key]) + instanceToUpdate[key] = obj[key] } } +function resetSequelizeInstance (instance: Model, savedFields: object) { + Object.keys(savedFields).forEach(key => { + instance[key] = savedFields[key] + }) +} + // --------------------------------------------------------------------------- export { + resetSequelizeInstance, retryTransactionWrapper, transactionRetryer, updateInstanceWithAnother