X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fextra-utils%2Fserver%2Fjobs.ts;fp=shared%2Fextra-utils%2Fserver%2Fjobs.ts;h=b3db885e85d3db8fe5d9771abe4baa87f09f13be;hb=bfbd912886eba17b4aa9a40dcef2fddc685d85bf;hp=11b570f609764d301ad997d5c287789c19bd285a;hpb=85394ba22a07bde1dfccebf3f591a5d6dbe9df56;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/extra-utils/server/jobs.ts b/shared/extra-utils/server/jobs.ts index 11b570f60..b3db885e8 100644 --- a/shared/extra-utils/server/jobs.ts +++ b/shared/extra-utils/server/jobs.ts @@ -2,7 +2,6 @@ import * as request from 'supertest' import { Job, JobState } from '../../models' import { wait } from '../miscs/miscs' import { ServerInfo } from './servers' -import { inspect } from 'util' function getJobsList (url: string, accessToken: string, state: JobState) { const path = '/api/v1/jobs/' + state @@ -37,11 +36,10 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) { else servers = serversArg as ServerInfo[] const states: JobState[] = [ 'waiting', 'active', 'delayed' ] - let pendingRequests = false + let pendingRequests: boolean function tasksBuilder () { const tasks: Promise[] = [] - pendingRequests = false // Check if each server has pending request for (const server of servers) { @@ -62,6 +60,7 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) { } do { + pendingRequests = false await Promise.all(tasksBuilder()) // Retry, in case of new jobs were created