aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-02-27 13:46:56 +0100
committerChocobozzz <me@florianbigard.com>2018-02-27 13:46:56 +0100
commit6fdc553adb23db216b44e425a85ea76bdf0a2a40 (patch)
tree997cf166c2ef977ce0390a9c7a892040bbe26f64 /server/lib
parent266707202c2ffcb8a1b7649ec29106dd444f4a77 (diff)
downloadPeerTube-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.ts3
-rw-r--r--server/lib/schedulers/remove-old-jobs-scheduler.ts3
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 @@
1import { isTestInstance } from '../../helpers/core-utils'
1import { logger } from '../../helpers/logger' 2import { logger } from '../../helpers/logger'
2import { ActorFollowModel } from '../../models/activitypub/actor-follow' 3import { ActorFollowModel } from '../../models/activitypub/actor-follow'
3import { AbstractScheduler } from './abstract-scheduler' 4import { 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 @@
1import { isTestInstance } from '../../helpers/core-utils'
1import { logger } from '../../helpers/logger' 2import { logger } from '../../helpers/logger'
2import { JobQueue } from '../job-queue' 3import { JobQueue } from '../job-queue'
3import { AbstractScheduler } from './abstract-scheduler' 4import { 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 }