aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-07-18 11:55:13 +0200
committerChocobozzz <me@florianbigard.com>2022-07-18 11:55:13 +0200
commit1cc9774668827c1255e4cd0775cb781c7f73051c (patch)
tree6ee5099e069e35ca100e74ac1de54ba94113a9b3
parent42b40636991b97fe818007fab19091764fc5db73 (diff)
downloadPeerTube-1cc9774668827c1255e4cd0775cb781c7f73051c.tar.gz
PeerTube-1cc9774668827c1255e4cd0775cb781c7f73051c.tar.zst
PeerTube-1cc9774668827c1255e4cd0775cb781c7f73051c.zip
Fix incorrect error logs
-rw-r--r--server/controllers/api/server/follows.ts2
-rw-r--r--server/lib/activitypub/actors/refresh.ts2
-rw-r--r--server/lib/client-html.ts2
-rw-r--r--server/models/actor/actor-image.ts2
-rw-r--r--server/models/video/thumbnail.ts2
5 files changed, 5 insertions, 5 deletions
diff --git a/server/controllers/api/server/follows.ts b/server/controllers/api/server/follows.ts
index 9557810b5..37e8d88f7 100644
--- a/server/controllers/api/server/follows.ts
+++ b/server/controllers/api/server/follows.ts
@@ -168,7 +168,7 @@ async function removeFollowing (req: express.Request, res: express.Response) {
168 168
169 // Async, could be long 169 // Async, could be long
170 removeRedundanciesOfServer(server.id) 170 removeRedundanciesOfServer(server.id)
171 .catch(err => logger.error('Cannot remove redundancy of %s.', server.host, err)) 171 .catch(err => logger.error('Cannot remove redundancy of %s.', server.host, { err }))
172 172
173 await follow.destroy({ transaction: t }) 173 await follow.destroy({ transaction: t })
174 }) 174 })
diff --git a/server/lib/activitypub/actors/refresh.ts b/server/lib/activitypub/actors/refresh.ts
index 8ce2cd5d9..6d8428d66 100644
--- a/server/lib/activitypub/actors/refresh.ts
+++ b/server/lib/activitypub/actors/refresh.ts
@@ -75,7 +75,7 @@ async function doRefresh <T extends MActorFull | MActorAccountChannelId> (option
75function getActorUrl (actor: MActorFull) { 75function getActorUrl (actor: MActorFull) {
76 return getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost()) 76 return getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost())
77 .catch(err => { 77 .catch(err => {
78 logger.warn('Cannot get actor URL from webfinger, keeping the old one.', err) 78 logger.warn('Cannot get actor URL from webfinger, keeping the old one.', { err })
79 return actor.url 79 return actor.url
80 }) 80 })
81} 81}
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index 899d80c15..4fd9a4263 100644
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -576,7 +576,7 @@ async function serveIndexHTML (req: express.Request, res: express.Response) {
576 await generateHTMLPage(req, res, req.params.language) 576 await generateHTMLPage(req, res, req.params.language)
577 return 577 return
578 } catch (err) { 578 } catch (err) {
579 logger.error('Cannot generate HTML page.', err) 579 logger.error('Cannot generate HTML page.', { err })
580 return res.status(HttpStatusCode.INTERNAL_SERVER_ERROR_500).end() 580 return res.status(HttpStatusCode.INTERNAL_SERVER_ERROR_500).end()
581 } 581 }
582 } 582 }
diff --git a/server/models/actor/actor-image.ts b/server/models/actor/actor-image.ts
index 9d44ef4d1..f2b3b2f4b 100644
--- a/server/models/actor/actor-image.ts
+++ b/server/models/actor/actor-image.ts
@@ -91,7 +91,7 @@ export class ActorImageModel extends Model<Partial<AttributesOnly<ActorImageMode
91 91
92 // Don't block the transaction 92 // Don't block the transaction
93 instance.removeImage() 93 instance.removeImage()
94 .catch(err => logger.error('Cannot remove actor image file %s.', instance.filename, err)) 94 .catch(err => logger.error('Cannot remove actor image file %s.', instance.filename, { err }))
95 } 95 }
96 96
97 static loadByName (filename: string) { 97 static loadByName (filename: string) {
diff --git a/server/models/video/thumbnail.ts b/server/models/video/thumbnail.ts
index 05c58cf19..f33bd3179 100644
--- a/server/models/video/thumbnail.ts
+++ b/server/models/video/thumbnail.ts
@@ -127,7 +127,7 @@ export class ThumbnailModel extends Model<Partial<AttributesOnly<ThumbnailModel>
127 127
128 // Don't block the transaction 128 // Don't block the transaction
129 instance.removeThumbnail() 129 instance.removeThumbnail()
130 .catch(err => logger.error('Cannot remove thumbnail file %s.', instance.filename, err)) 130 .catch(err => logger.error('Cannot remove thumbnail file %s.', instance.filename, { err }))
131 } 131 }
132 132
133 static loadByFilename (filename: string, thumbnailType: ThumbnailType): Promise<MThumbnail> { 133 static loadByFilename (filename: string, thumbnailType: ThumbnailType): Promise<MThumbnail> {