diff options
author | Chocobozzz <me@florianbigard.com> | 2019-07-31 15:57:32 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-08-01 09:11:04 +0200 |
commit | bfbd912886eba17b4aa9a40dcef2fddc685d85bf (patch) | |
tree | 85e0f22980210a8ccd0888eb5e1790b152074677 /shared/extra-utils/server | |
parent | 85394ba22a07bde1dfccebf3f591a5d6dbe9df56 (diff) | |
download | PeerTube-bfbd912886eba17b4aa9a40dcef2fddc685d85bf.tar.gz PeerTube-bfbd912886eba17b4aa9a40dcef2fddc685d85bf.tar.zst PeerTube-bfbd912886eba17b4aa9a40dcef2fddc685d85bf.zip |
Fix broken playlist api
Diffstat (limited to 'shared/extra-utils/server')
-rw-r--r-- | shared/extra-utils/server/jobs.ts | 5 |
1 files changed, 2 insertions, 3 deletions
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' | |||
2 | import { Job, JobState } from '../../models' | 2 | import { Job, JobState } from '../../models' |
3 | import { wait } from '../miscs/miscs' | 3 | import { wait } from '../miscs/miscs' |
4 | import { ServerInfo } from './servers' | 4 | import { ServerInfo } from './servers' |
5 | import { inspect } from 'util' | ||
6 | 5 | ||
7 | function getJobsList (url: string, accessToken: string, state: JobState) { | 6 | function getJobsList (url: string, accessToken: string, state: JobState) { |
8 | const path = '/api/v1/jobs/' + state | 7 | const path = '/api/v1/jobs/' + state |
@@ -37,11 +36,10 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) { | |||
37 | else servers = serversArg as ServerInfo[] | 36 | else servers = serversArg as ServerInfo[] |
38 | 37 | ||
39 | const states: JobState[] = [ 'waiting', 'active', 'delayed' ] | 38 | const states: JobState[] = [ 'waiting', 'active', 'delayed' ] |
40 | let pendingRequests = false | 39 | let pendingRequests: boolean |
41 | 40 | ||
42 | function tasksBuilder () { | 41 | function tasksBuilder () { |
43 | const tasks: Promise<any>[] = [] | 42 | const tasks: Promise<any>[] = [] |
44 | pendingRequests = false | ||
45 | 43 | ||
46 | // Check if each server has pending request | 44 | // Check if each server has pending request |
47 | for (const server of servers) { | 45 | for (const server of servers) { |
@@ -62,6 +60,7 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) { | |||
62 | } | 60 | } |
63 | 61 | ||
64 | do { | 62 | do { |
63 | pendingRequests = false | ||
65 | await Promise.all(tasksBuilder()) | 64 | await Promise.all(tasksBuilder()) |
66 | 65 | ||
67 | // Retry, in case of new jobs were created | 66 | // Retry, in case of new jobs were created |