X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Futils.js;h=6d40e8f3fce3451f40b7e541fa6481f05cc6fddf;hb=f282639b07deee1e35403bd86c46ea521fb4845e;hp=a902850cdd044026247350d479b8de07dd45e51b;hpb=99fe265a5fc077cb66c322e7f3d191ff7110aea0;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/utils.js b/server/helpers/utils.js index a902850cd..6d40e8f3f 100644 --- a/server/helpers/utils.js +++ b/server/helpers/utils.js @@ -1,17 +1,16 @@ 'use strict' const crypto = require('crypto') -const retry = require('async/retry') const logger = require('./logger') const utils = { badRequest, + createEmptyCallback, cleanForExit, generateRandomString, isTestInstance, - getFormatedObjects, - transactionRetryer + getFormatedObjects } function badRequest (req, res, next) { @@ -31,6 +30,12 @@ function cleanForExit (webtorrentProcess) { process.kill(-webtorrentProcess.pid) } +function createEmptyCallback () { + return function (err) { + if (err) logger.error('Error in empty callback.', { error: err }) + } +} + function isTestInstance () { return (process.env.NODE_ENV === 'test') } @@ -48,18 +53,6 @@ function getFormatedObjects (objects, objectsTotal) { } } -function transactionRetryer (func, callback) { - retry({ - times: 5, - - errorFilter: function (err) { - const willRetry = (err.name === 'SequelizeDatabaseError') - logger.debug('Maybe retrying the transaction function.', { willRetry }) - return willRetry - } - }, func, callback) -} - // --------------------------------------------------------------------------- module.exports = utils