aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models/job
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-07-05 13:26:25 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-07-05 14:14:16 +0200
commit6fcd19ba737f1f5614a56c6925adb882dea43b8d (patch)
tree3365a96d82bc7f00ae504a568725c8e914150cf8 /server/models/job
parent5fe7e898316e18369c3e1aba307b55077adc7bfb (diff)
downloadPeerTube-6fcd19ba737f1f5614a56c6925adb882dea43b8d.tar.gz
PeerTube-6fcd19ba737f1f5614a56c6925adb882dea43b8d.tar.zst
PeerTube-6fcd19ba737f1f5614a56c6925adb882dea43b8d.zip
Move to promises
Closes https://github.com/Chocobozzz/PeerTube/issues/74
Diffstat (limited to 'server/models/job')
-rw-r--r--server/models/job/job-interface.ts4
-rw-r--r--server/models/job/job.ts5
2 files changed, 4 insertions, 5 deletions
diff --git a/server/models/job/job-interface.ts b/server/models/job/job-interface.ts
index 31b377367..ba5622977 100644
--- a/server/models/job/job-interface.ts
+++ b/server/models/job/job-interface.ts
@@ -1,10 +1,10 @@
1import * as Sequelize from 'sequelize' 1import * as Sequelize from 'sequelize'
2import * as Promise from 'bluebird'
2 3
3import { JobState } from '../../../shared/models/job.model' 4import { JobState } from '../../../shared/models/job.model'
4 5
5export namespace JobMethods { 6export namespace JobMethods {
6 export type ListWithLimitCallback = (err: Error, jobInstances: JobInstance[]) => void 7 export type ListWithLimit = (limit: number, state: JobState) => Promise<JobInstance[]>
7 export type ListWithLimit = (limit: number, state: JobState, callback: ListWithLimitCallback) => void
8} 8}
9 9
10export interface JobClass { 10export interface JobClass {
diff --git a/server/models/job/job.ts b/server/models/job/job.ts
index 38e4e8f30..968f9d71d 100644
--- a/server/models/job/job.ts
+++ b/server/models/job/job.ts
@@ -5,7 +5,6 @@ import { JOB_STATES } from '../../initializers'
5 5
6import { addMethodsToModel } from '../utils' 6import { addMethodsToModel } from '../utils'
7import { 7import {
8 JobClass,
9 JobInstance, 8 JobInstance,
10 JobAttributes, 9 JobAttributes,
11 10
@@ -49,7 +48,7 @@ export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Se
49 48
50// --------------------------------------------------------------------------- 49// ---------------------------------------------------------------------------
51 50
52listWithLimit = function (limit: number, state: JobState, callback: JobMethods.ListWithLimitCallback) { 51listWithLimit = function (limit: number, state: JobState) {
53 const query = { 52 const query = {
54 order: [ 53 order: [
55 [ 'id', 'ASC' ] 54 [ 'id', 'ASC' ]
@@ -60,5 +59,5 @@ listWithLimit = function (limit: number, state: JobState, callback: JobMethods.L
60 } 59 }
61 } 60 }
62 61
63 return Job.findAll(query).asCallback(callback) 62 return Job.findAll(query)
64} 63}