NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(xo-server/utils): remove scheduleFn

Browse Source
This commit is contained in:
Julien Fontanet 2018-02-13 14:46:33 +01:00
parent 31f420937e
commit 42cd5d8e58
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/xo-server/src/utils.js
View File

@ -22,7 +22,6 @@ import { resolve } from 'path'
import 'moment-timezone' import 'moment-timezone'
import through2 from 'through2' import through2 from 'through2'
import { createSchedule } from '@xen-orchestra/cron'
import { utcFormat, utcParse } from 'd3-time-format' import { utcFormat, utcParse } from 'd3-time-format'
import { import {
all as pAll, all as pAll,
@ -521,22 +520,6 @@ export const streamToArray = (stream, { filter, mapper } = {}) =>
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Contrary to most implentations this one use the range 0-11 instead
// of 1-12 for months.
export const scheduleFn = (cronTime, fn, timeZone) =>
createSchedule(cronTime, timeZone).startJob(async () => {
try {
await fn()
} catch (error) {
console.error(
'[WARN] scheduled function:',
(error && error.stack) || error
)
}
})
// -------------------------------------------------------------------
// Create a serializable object from an error. // Create a serializable object from an error.
export const serializeError = error => ({ export const serializeError = error => ({
message: error.message, message: error.message,

15
packages/xo-server/src/xo-mixins/scheduling.js
View File

@ -1,8 +1,9 @@
import { BaseError } from 'make-error' import { BaseError } from 'make-error'
import { createSchedule } from '@xen-orchestra/cron'
import { noSuchObject } from 'xo-common/api-errors.js' import { noSuchObject } from 'xo-common/api-errors.js'
import { Schedules } from '../models/schedule' import { Schedules } from '../models/schedule'
import { forEach, mapToArray, scheduleFn } from '../utils' import { forEach, mapToArray } from '../utils'
// =================================================================== // ===================================================================
@ -79,16 +80,10 @@ export default class {
return this._scheduleTable[_resolveId(scheduleOrId)] return this._scheduleTable[_resolveId(scheduleOrId)]
} }
_enable (schedule) { _enable ({ cron, id, job, timezone }) {
const { id } = schedule this._cronJobs[id] = createSchedule(cron, timezone).startJob(() =>
this.xo.runJobSequence([job])
const stopSchedule = scheduleFn(
schedule.cron,
() => this.xo.runJobSequence([schedule.job]),
schedule.timezone
) )
this._cronJobs[id] = stopSchedule
this._scheduleTable[id] = true this._scheduleTable[id] = true
} }