diff options
author | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
---|---|---|
committer | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
commit | bc22d60899e14631cba0fb6450f4e85fc9528293 (patch) | |
tree | 285fa55033bc065df803adc2e4e3142fdfdd7309 /shared/utils/server | |
parent | b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13 (diff) | |
parent | d216b5387fb774d1355df3ace002f7be469bd450 (diff) | |
download | PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.gz PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.zst PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.zip |
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
Diffstat (limited to 'shared/utils/server')
-rw-r--r-- | shared/utils/server/config.ts | 2 | ||||
-rw-r--r-- | shared/utils/server/jobs.ts | 3 | ||||
-rw-r--r-- | shared/utils/server/stats.ts | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/shared/utils/server/config.ts b/shared/utils/server/config.ts index 15a94432b..5b888b061 100644 --- a/shared/utils/server/config.ts +++ b/shared/utils/server/config.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../' | 1 | import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../requests/requests' |
2 | import { CustomConfig } from '../../models/server/custom-config.model' | 2 | import { CustomConfig } from '../../models/server/custom-config.model' |
3 | 3 | ||
4 | function getConfig (url: string) { | 4 | function getConfig (url: string) { |
diff --git a/shared/utils/server/jobs.ts b/shared/utils/server/jobs.ts index 3eec1d7d7..7c7e89824 100644 --- a/shared/utils/server/jobs.ts +++ b/shared/utils/server/jobs.ts | |||
@@ -1,6 +1,7 @@ | |||
1 | import * as request from 'supertest' | 1 | import * as request from 'supertest' |
2 | import { Job, JobState } from '../../models' | 2 | import { Job, JobState } from '../../models' |
3 | import { ServerInfo, wait } from '../index' | 3 | import { wait } from '../miscs/miscs' |
4 | import { ServerInfo } from './servers' | ||
4 | 5 | ||
5 | function getJobsList (url: string, accessToken: string, state: JobState) { | 6 | function getJobsList (url: string, accessToken: string, state: JobState) { |
6 | const path = '/api/v1/jobs/' + state | 7 | const path = '/api/v1/jobs/' + state |
diff --git a/shared/utils/server/stats.ts b/shared/utils/server/stats.ts index 01989d952..6f079ad18 100644 --- a/shared/utils/server/stats.ts +++ b/shared/utils/server/stats.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { makeGetRequest } from '../' | 1 | import { makeGetRequest } from '../requests/requests' |
2 | 2 | ||
3 | function getStats (url: string, useCache = false) { | 3 | function getStats (url: string, useCache = false) { |
4 | const path = '/api/v1/server/stats' | 4 | const path = '/api/v1/server/stats' |