diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-01 15:43:42 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-01 15:45:15 +0200 |
commit | 32e574750a7b06699073ac8e98aeebaf2fa8a82d (patch) | |
tree | 513080abb940eff3b71cde956a4e8a79d9d6f423 | |
parent | 5abeec313f897bbb1f1f39c3849675ec9a77d506 (diff) | |
download | PeerTube-32e574750a7b06699073ac8e98aeebaf2fa8a82d.tar.gz PeerTube-32e574750a7b06699073ac8e98aeebaf2fa8a82d.tar.zst PeerTube-32e574750a7b06699073ac8e98aeebaf2fa8a82d.zip |
Add "max requests number" information for requests iterations
3 files changed, 10 insertions, 1 deletions
diff --git a/client/src/app/admin/requests/request-stats/request-stats.component.html b/client/src/app/admin/requests/request-stats/request-stats.component.html index 1b90100e7..b5ac59a9a 100644 --- a/client/src/app/admin/requests/request-stats/request-stats.component.html +++ b/client/src/app/admin/requests/request-stats/request-stats.component.html | |||
@@ -12,6 +12,11 @@ | |||
12 | </div> | 12 | </div> |
13 | 13 | ||
14 | <div> | 14 | <div> |
15 | <span class="label-description">Maximum number of requests per interval:</span> | ||
16 | {{ stats.maxRequestsInParallel }} | ||
17 | </div> | ||
18 | |||
19 | <div> | ||
15 | <span class="label-description">Remaining requests:</span> | 20 | <span class="label-description">Remaining requests:</span> |
16 | {{ stats.requests.length }} | 21 | {{ stats.requests.length }} |
17 | </div> | 22 | </div> |
diff --git a/client/src/app/admin/requests/shared/request-stats.model.ts b/client/src/app/admin/requests/shared/request-stats.model.ts index dfa956f10..766e80836 100644 --- a/client/src/app/admin/requests/shared/request-stats.model.ts +++ b/client/src/app/admin/requests/shared/request-stats.model.ts | |||
@@ -4,15 +4,18 @@ export interface Request { | |||
4 | } | 4 | } |
5 | 5 | ||
6 | export class RequestStats { | 6 | export class RequestStats { |
7 | maxRequestsInParallel: number; | ||
7 | milliSecondsInterval: number; | 8 | milliSecondsInterval: number; |
8 | remainingMilliSeconds: number; | 9 | remainingMilliSeconds: number; |
9 | requests: Request[]; | 10 | requests: Request[]; |
10 | 11 | ||
11 | constructor(hash: { | 12 | constructor(hash: { |
13 | maxRequestsInParallel: number, | ||
12 | milliSecondsInterval: number, | 14 | milliSecondsInterval: number, |
13 | remainingMilliSeconds: number, | 15 | remainingMilliSeconds: number, |
14 | requests: Request[]; | 16 | requests: Request[]; |
15 | }) { | 17 | }) { |
18 | this.maxRequestsInParallel = hash.maxRequestsInParallel; | ||
16 | this.milliSecondsInterval = hash.milliSecondsInterval; | 19 | this.milliSecondsInterval = hash.milliSecondsInterval; |
17 | this.remainingMilliSeconds = hash.remainingMilliSeconds; | 20 | this.remainingMilliSeconds = hash.remainingMilliSeconds; |
18 | this.requests = hash.requests; | 21 | this.requests = hash.requests; |
diff --git a/server/controllers/api/v1/requests.js b/server/controllers/api/v1/requests.js index 9610e5cd6..97616424d 100644 --- a/server/controllers/api/v1/requests.js +++ b/server/controllers/api/v1/requests.js | |||
@@ -30,6 +30,7 @@ function getStatsRequests (req, res, next) { | |||
30 | 30 | ||
31 | return res.json({ | 31 | return res.json({ |
32 | requests: requests, | 32 | requests: requests, |
33 | maxRequestsInParallel: constants.REQUESTS_IN_PARALLEL, | ||
33 | remainingMilliSeconds: Request.remainingMilliSeconds(), | 34 | remainingMilliSeconds: Request.remainingMilliSeconds(), |
34 | milliSecondsInterval: constants.REQUESTS_INTERVAL | 35 | milliSecondsInterval: constants.REQUESTS_INTERVAL |
35 | }) | 36 | }) |