projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add sitemap
[oweals/peertube.git]
/
server
/
helpers
/
database-utils.ts
diff --git
a/server/helpers/database-utils.ts
b/server/helpers/database-utils.ts
index ededa79016fb3e3be8c79274eb390d5788805895..1005d2cf19694f16e3f0cf1f000834a9c3a83972 100644
(file)
--- a/
server/helpers/database-utils.ts
+++ b/
server/helpers/database-utils.ts
@@
-35,7
+35,7
@@
function retryTransactionWrapper <T> (
.catch(err => callback(err))
})
.catch(err => {
.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
})
}
throw err
})
}
@@
-66,9
+66,17
@@
function updateInstanceWithAnother <T extends Model<T>> (instanceToUpdate: Model
}
}
}
}
+function resetSequelizeInstance (instance: Model<any>, savedFields: object) {
+ Object.keys(savedFields).forEach(key => {
+ const value = savedFields[key]
+ instance.set(key, value)
+ })
+}
+
// ---------------------------------------------------------------------------
export {
// ---------------------------------------------------------------------------
export {
+ resetSequelizeInstance,
retryTransactionWrapper,
transactionRetryer,
updateInstanceWithAnother
retryTransactionWrapper,
transactionRetryer,
updateInstanceWithAnother