diff options
author | Chocobozzz <me@florianbigard.com> | 2018-12-04 09:34:29 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-12-04 10:08:45 +0100 |
commit | f9a971c671d5a8b88f420a86656a788575105598 (patch) | |
tree | 71bfda2e46e6ee9537a5c2eb34485cfe2dc322db /server | |
parent | 5c94c38d18a02864b6f384bcd829a0d3f2d86c4a (diff) | |
download | PeerTube-f9a971c671d5a8b88f420a86656a788575105598.tar.gz PeerTube-f9a971c671d5a8b88f420a86656a788575105598.tar.zst PeerTube-f9a971c671d5a8b88f420a86656a788575105598.zip |
Update dependencies
Diffstat (limited to 'server')
-rw-r--r-- | server/initializers/constants.ts | 2 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/video-file.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index aa243859c..8a8bcd126 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -773,7 +773,7 @@ function buildVideosRedundancy (objs: any[]): VideosRedundancy[] { | |||
773 | if (!objs) return [] | 773 | if (!objs) return [] |
774 | 774 | ||
775 | return objs.map(obj => { | 775 | return objs.map(obj => { |
776 | return Object.assign(obj, { | 776 | return Object.assign({}, obj, { |
777 | minLifetime: parseDuration(obj.min_lifetime), | 777 | minLifetime: parseDuration(obj.min_lifetime), |
778 | size: bytes.parse(obj.size), | 778 | size: bytes.parse(obj.size), |
779 | minViews: obj.min_views | 779 | minViews: obj.min_views |
diff --git a/server/lib/job-queue/handlers/video-file.ts b/server/lib/job-queue/handlers/video-file.ts index adc0a2a15..ddbf6d1c2 100644 --- a/server/lib/job-queue/handlers/video-file.ts +++ b/server/lib/job-queue/handlers/video-file.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import * as Bull from 'bull' | 1 | import * as Bull from 'bull' |
2 | import { VideoResolution, VideoState } from '../../../../shared' | 2 | import { VideoResolution, VideoState, Job } from '../../../../shared' |
3 | import { logger } from '../../../helpers/logger' | 3 | import { logger } from '../../../helpers/logger' |
4 | import { VideoModel } from '../../../models/video/video' | 4 | import { VideoModel } from '../../../models/video/video' |
5 | import { JobQueue } from '../job-queue' | 5 | import { JobQueue } from '../job-queue' |
@@ -111,7 +111,7 @@ async function onVideoFileOptimizerSuccess (video: VideoModel, isNewVideo: boole | |||
111 | ) | 111 | ) |
112 | 112 | ||
113 | if (resolutionsEnabled.length !== 0) { | 113 | if (resolutionsEnabled.length !== 0) { |
114 | const tasks: Bluebird<any>[] = [] | 114 | const tasks: Bluebird<Bull.Job<any>>[] = [] |
115 | 115 | ||
116 | for (const resolution of resolutionsEnabled) { | 116 | for (const resolution of resolutionsEnabled) { |
117 | const dataInput = { | 117 | const dataInput = { |