diff options
Diffstat (limited to 'server/lib/activitypub/videos/updater.ts')
-rw-r--r-- | server/lib/activitypub/videos/updater.ts | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/server/lib/activitypub/videos/updater.ts b/server/lib/activitypub/videos/updater.ts index 6745e2efd..3339611fc 100644 --- a/server/lib/activitypub/videos/updater.ts +++ b/server/lib/activitypub/videos/updater.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Transaction } from 'sequelize/types' | 1 | import { Transaction } from 'sequelize/types' |
2 | import { resetSequelizeInstance } from '@server/helpers/database-utils' | 2 | import { resetSequelizeInstance } from '@server/helpers/database-utils' |
3 | import { logger, loggerTagsFactory } from '@server/helpers/logger' | 3 | import { logger, loggerTagsFactory, LoggerTagsFn } from '@server/helpers/logger' |
4 | import { sequelizeTypescript } from '@server/initializers/database' | 4 | import { sequelizeTypescript } from '@server/initializers/database' |
5 | import { Notifier } from '@server/lib/notifier' | 5 | import { Notifier } from '@server/lib/notifier' |
6 | import { PeerTubeSocket } from '@server/lib/peertube-socket' | 6 | import { PeerTubeSocket } from '@server/lib/peertube-socket' |
@@ -19,7 +19,7 @@ export class APVideoUpdater extends APVideoAbstractBuilder { | |||
19 | 19 | ||
20 | private readonly oldVideoChannel: MChannelAccountLight | 20 | private readonly oldVideoChannel: MChannelAccountLight |
21 | 21 | ||
22 | protected lTags = loggerTagsFactory('ap', 'video', 'update') | 22 | protected lTags: LoggerTagsFn |
23 | 23 | ||
24 | constructor ( | 24 | constructor ( |
25 | protected readonly videoObject: VideoObject, | 25 | protected readonly videoObject: VideoObject, |
@@ -33,12 +33,14 @@ export class APVideoUpdater extends APVideoAbstractBuilder { | |||
33 | this.oldVideoChannel = this.video.VideoChannel | 33 | this.oldVideoChannel = this.video.VideoChannel |
34 | 34 | ||
35 | this.videoFieldsSave = this.video.toJSON() | 35 | this.videoFieldsSave = this.video.toJSON() |
36 | |||
37 | this.lTags = loggerTagsFactory('ap', 'video', 'update', video.uuid, video.url) | ||
36 | } | 38 | } |
37 | 39 | ||
38 | async update (overrideTo?: string[]) { | 40 | async update (overrideTo?: string[]) { |
39 | logger.debug( | 41 | logger.debug( |
40 | 'Updating remote video "%s".', this.videoObject.uuid, | 42 | 'Updating remote video "%s".', this.videoObject.uuid, |
41 | { videoObject: this.videoObject, ...this.lTags(this.videoObject.uuid) } | 43 | { videoObject: this.videoObject, ...this.lTags() } |
42 | ) | 44 | ) |
43 | 45 | ||
44 | try { | 46 | try { |
@@ -82,7 +84,7 @@ export class APVideoUpdater extends APVideoAbstractBuilder { | |||
82 | PeerTubeSocket.Instance.sendVideoViewsUpdate(videoUpdated) | 84 | PeerTubeSocket.Instance.sendVideoViewsUpdate(videoUpdated) |
83 | } | 85 | } |
84 | 86 | ||
85 | logger.info('Remote video with uuid %s updated', this.videoObject.uuid, this.lTags(this.videoObject.uuid)) | 87 | logger.info('Remote video with uuid %s updated', this.videoObject.uuid, this.lTags()) |
86 | 88 | ||
87 | return videoUpdated | 89 | return videoUpdated |
88 | } catch (err) { | 90 | } catch (err) { |
@@ -158,7 +160,7 @@ export class APVideoUpdater extends APVideoAbstractBuilder { | |||
158 | } | 160 | } |
159 | 161 | ||
160 | // This is just a debug because we will retry the insert | 162 | // This is just a debug because we will retry the insert |
161 | logger.debug('Cannot update the remote video.', { err, ...this.lTags(this.videoObject.uuid) }) | 163 | logger.debug('Cannot update the remote video.', { err, ...this.lTags() }) |
162 | throw err | 164 | throw err |
163 | } | 165 | } |
164 | } | 166 | } |