diff options
author | Chocobozzz <me@florianbigard.com> | 2018-02-27 13:46:56 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-02-27 13:46:56 +0100 |
commit | 6fdc553adb23db216b44e425a85ea76bdf0a2a40 (patch) | |
tree | 997cf166c2ef977ce0390a9c7a892040bbe26f64 /server/lib | |
parent | 266707202c2ffcb8a1b7649ec29106dd444f4a77 (diff) | |
download | PeerTube-6fdc553adb23db216b44e425a85ea76bdf0a2a40.tar.gz PeerTube-6fdc553adb23db216b44e425a85ea76bdf0a2a40.tar.zst PeerTube-6fdc553adb23db216b44e425a85ea76bdf0a2a40.zip |
Don't fail on upload if we cannot generate thumbnail
Diffstat (limited to 'server/lib')
-rw-r--r-- | server/lib/schedulers/bad-actor-follow-scheduler.ts | 3 | ||||
-rw-r--r-- | server/lib/schedulers/remove-old-jobs-scheduler.ts | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server/lib/schedulers/bad-actor-follow-scheduler.ts b/server/lib/schedulers/bad-actor-follow-scheduler.ts index 397eb470e..9b9f9e17d 100644 --- a/server/lib/schedulers/bad-actor-follow-scheduler.ts +++ b/server/lib/schedulers/bad-actor-follow-scheduler.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import { isTestInstance } from '../../helpers/core-utils' | ||
1 | import { logger } from '../../helpers/logger' | 2 | import { logger } from '../../helpers/logger' |
2 | import { ActorFollowModel } from '../../models/activitypub/actor-follow' | 3 | import { ActorFollowModel } from '../../models/activitypub/actor-follow' |
3 | import { AbstractScheduler } from './abstract-scheduler' | 4 | import { AbstractScheduler } from './abstract-scheduler' |
@@ -11,7 +12,7 @@ export class BadActorFollowScheduler extends AbstractScheduler { | |||
11 | } | 12 | } |
12 | 13 | ||
13 | async execute () { | 14 | async execute () { |
14 | logger.info('Removing bad actor follows (scheduler).') | 15 | if (!isTestInstance()) logger.info('Removing bad actor follows (scheduler).') |
15 | 16 | ||
16 | try { | 17 | try { |
17 | await ActorFollowModel.removeBadActorFollows() | 18 | await ActorFollowModel.removeBadActorFollows() |
diff --git a/server/lib/schedulers/remove-old-jobs-scheduler.ts b/server/lib/schedulers/remove-old-jobs-scheduler.ts index 51fcf711e..0e8ad1554 100644 --- a/server/lib/schedulers/remove-old-jobs-scheduler.ts +++ b/server/lib/schedulers/remove-old-jobs-scheduler.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import { isTestInstance } from '../../helpers/core-utils' | ||
1 | import { logger } from '../../helpers/logger' | 2 | import { logger } from '../../helpers/logger' |
2 | import { JobQueue } from '../job-queue' | 3 | import { JobQueue } from '../job-queue' |
3 | import { AbstractScheduler } from './abstract-scheduler' | 4 | import { AbstractScheduler } from './abstract-scheduler' |
@@ -11,7 +12,7 @@ export class RemoveOldJobsScheduler extends AbstractScheduler { | |||
11 | } | 12 | } |
12 | 13 | ||
13 | async execute () { | 14 | async execute () { |
14 | logger.info('Removing old jobs (scheduler).') | 15 | if (!isTestInstance()) logger.info('Removing old jobs (scheduler).') |
15 | 16 | ||
16 | JobQueue.Instance.removeOldJobs() | 17 | JobQueue.Instance.removeOldJobs() |
17 | } | 18 | } |