diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /server/models/avatar | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'server/models/avatar')
| -rw-r--r-- | server/models/avatar/avatar.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/models/avatar/avatar.ts b/server/models/avatar/avatar.ts index 5d73e24fa..303aebcc2 100644 --- a/server/models/avatar/avatar.ts +++ b/server/models/avatar/avatar.ts | |||
| @@ -23,7 +23,10 @@ export class AvatarModel extends Model<AvatarModel> { | |||
| 23 | @AfterDestroy | 23 | @AfterDestroy |
| 24 | static removeFilesAndSendDelete (instance: AvatarModel) { | 24 | static removeFilesAndSendDelete (instance: AvatarModel) { |
| 25 | logger.info('Removing avatar file %s.', instance.filename) | 25 | logger.info('Removing avatar file %s.', instance.filename) |
| 26 | return instance.removeAvatar() | 26 | |
| 27 | // Don't block the transaction | ||
| 28 | instance.removeAvatar() | ||
| 29 | .catch(err => logger.error('Cannot remove avatar file %s.', instance.filename, err)) | ||
| 27 | } | 30 | } |
| 28 | 31 | ||
| 29 | toFormattedJSON (): Avatar { | 32 | toFormattedJSON (): Avatar { |