X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Frequest%2Frequest-scheduler.ts;h=69d840eeb140705547c14ab15b19e63fb56f011d;hb=ed5f91633d96436408c763bb96d2cc463cb7dc00;hp=26ffbfb868f892e5f384a3caf059dd728600d15d;hpb=e02643f32e4c97ca307f8fc5b69be79c40d70a3b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/request/request-scheduler.ts b/server/lib/request/request-scheduler.ts index 26ffbfb86..69d840eeb 100644 --- a/server/lib/request/request-scheduler.ts +++ b/server/lib/request/request-scheduler.ts @@ -1,3 +1,5 @@ +import * as Sequelize from 'sequelize' + import { database as db } from '../../initializers/database' import { BaseRequestScheduler } from './base-request-scheduler' import { logger } from '../../helpers' @@ -6,6 +8,14 @@ import { REQUESTS_LIMIT_PER_POD } from '../../initializers' +export type RequestSchedulerOptions = { + type: string + endpoint: string + data: Object + toIds: number[] + transaction: Sequelize.Transaction +} + class RequestScheduler extends BaseRequestScheduler { constructor () { super() @@ -25,7 +35,7 @@ class RequestScheduler extends BaseRequestScheduler { return db.RequestToPod } - buildRequestObjects (requests) { + buildRequestObjects (requests: { [ toPodId: number ]: any }) { const requestsToMakeGrouped = {} Object.keys(requests).forEach(toPodId => { @@ -51,14 +61,7 @@ class RequestScheduler extends BaseRequestScheduler { return requestsToMakeGrouped } - // { type, endpoint, data, toIds, transaction } - createRequest (options, callback) { - const type = options.type - const endpoint = options.endpoint - const data = options.data - const toIds = options.toIds - const transaction = options.transaction - + createRequest ({ type, endpoint, data, toIds, transaction }: RequestSchedulerOptions, callback: (err: Error) => void) { // TODO: check the setPods works const podIds = [] @@ -77,7 +80,7 @@ class RequestScheduler extends BaseRequestScheduler { } } - const dbRequestOptions = { + const dbRequestOptions: Sequelize.CreateOptions = { transaction }