diff options
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/account/account.ts | 1 | ||||
-rw-r--r-- | server/models/avatar/avatar.ts | 2 | ||||
-rw-r--r-- | server/models/video/video-caption.ts | 2 | ||||
-rw-r--r-- | server/models/video/video-channel.ts | 2 | ||||
-rw-r--r-- | server/models/video/video.ts | 4 |
5 files changed, 4 insertions, 7 deletions
diff --git a/server/models/account/account.ts b/server/models/account/account.ts index 2eed66fc2..d674d8d22 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts | |||
@@ -139,7 +139,6 @@ export class AccountModel extends Model<AccountModel> { | |||
139 | } | 139 | } |
140 | 140 | ||
141 | if (instance.isOwned()) { | 141 | if (instance.isOwned()) { |
142 | logger.debug('Sending delete of actor of account %s.', instance.Actor.url) | ||
143 | return sendDeleteActor(instance.Actor, options.transaction) | 142 | return sendDeleteActor(instance.Actor, options.transaction) |
144 | } | 143 | } |
145 | 144 | ||
diff --git a/server/models/avatar/avatar.ts b/server/models/avatar/avatar.ts index e1d4c20bc..51e26c87b 100644 --- a/server/models/avatar/avatar.ts +++ b/server/models/avatar/avatar.ts | |||
@@ -3,6 +3,7 @@ import { AfterDestroy, AllowNull, Column, CreatedAt, Model, Table, UpdatedAt } f | |||
3 | import { Avatar } from '../../../shared/models/avatars/avatar.model' | 3 | import { Avatar } from '../../../shared/models/avatars/avatar.model' |
4 | import { unlinkPromise } from '../../helpers/core-utils' | 4 | import { unlinkPromise } from '../../helpers/core-utils' |
5 | import { CONFIG, STATIC_PATHS } from '../../initializers' | 5 | import { CONFIG, STATIC_PATHS } from '../../initializers' |
6 | import { logger } from '../../helpers/logger' | ||
6 | 7 | ||
7 | @Table({ | 8 | @Table({ |
8 | tableName: 'avatar' | 9 | tableName: 'avatar' |
@@ -21,6 +22,7 @@ export class AvatarModel extends Model<AvatarModel> { | |||
21 | 22 | ||
22 | @AfterDestroy | 23 | @AfterDestroy |
23 | static removeFilesAndSendDelete (instance: AvatarModel) { | 24 | static removeFilesAndSendDelete (instance: AvatarModel) { |
25 | logger.info('Removing avatar file %s.', instance.filename) | ||
24 | return instance.removeAvatar() | 26 | return instance.removeAvatar() |
25 | } | 27 | } |
26 | 28 | ||
diff --git a/server/models/video/video-caption.ts b/server/models/video/video-caption.ts index 5a1becc47..4a25097f8 100644 --- a/server/models/video/video-caption.ts +++ b/server/models/video/video-caption.ts | |||
@@ -80,7 +80,7 @@ export class VideoCaptionModel extends Model<VideoCaptionModel> { | |||
80 | } | 80 | } |
81 | 81 | ||
82 | if (instance.isOwned()) { | 82 | if (instance.isOwned()) { |
83 | logger.debug('Removing captions %s of video %s.', instance.Video.uuid, instance.language) | 83 | logger.info('Removing captions %s of video %s.', instance.Video.uuid, instance.language) |
84 | 84 | ||
85 | try { | 85 | try { |
86 | await instance.removeCaptionFile() | 86 | await instance.removeCaptionFile() |
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 6567b00d6..d0dba18d5 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts | |||
@@ -140,8 +140,6 @@ export class VideoChannelModel extends Model<VideoChannelModel> { | |||
140 | } | 140 | } |
141 | 141 | ||
142 | if (instance.Actor.isOwned()) { | 142 | if (instance.Actor.isOwned()) { |
143 | logger.debug('Sending delete of actor of video channel %s.', instance.Actor.url) | ||
144 | |||
145 | return sendDeleteActor(instance.Actor, options.transaction) | 143 | return sendDeleteActor(instance.Actor, options.transaction) |
146 | } | 144 | } |
147 | 145 | ||
diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 5808f3936..a6c4620b2 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts | |||
@@ -607,8 +607,6 @@ export class VideoModel extends Model<VideoModel> { | |||
607 | }) as VideoChannelModel | 607 | }) as VideoChannelModel |
608 | } | 608 | } |
609 | 609 | ||
610 | logger.debug('Sending delete of video %s.', instance.url) | ||
611 | |||
612 | return sendDeleteVideo(instance, options.transaction) | 610 | return sendDeleteVideo(instance, options.transaction) |
613 | } | 611 | } |
614 | 612 | ||
@@ -619,7 +617,7 @@ export class VideoModel extends Model<VideoModel> { | |||
619 | static async removeFiles (instance: VideoModel) { | 617 | static async removeFiles (instance: VideoModel) { |
620 | const tasks: Promise<any>[] = [] | 618 | const tasks: Promise<any>[] = [] |
621 | 619 | ||
622 | logger.debug('Removing files of video %s.', instance.url) | 620 | logger.info('Removing files of video %s.', instance.url) |
623 | 621 | ||
624 | tasks.push(instance.removeThumbnail()) | 622 | tasks.push(instance.removeThumbnail()) |
625 | 623 | ||