From 1cc9774668827c1255e4cd0775cb781c7f73051c Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 18 Jul 2022 11:55:13 +0200
Subject: [PATCH] Fix incorrect error logs

---
 server/controllers/api/server/follows.ts | 2 +-
 server/lib/activitypub/actors/refresh.ts | 2 +-
 server/lib/client-html.ts                | 2 +-
 server/models/actor/actor-image.ts       | 2 +-
 server/models/video/thumbnail.ts         | 2 +-
 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) {
 
     // Async, could be long
     removeRedundanciesOfServer(server.id)
-      .catch(err => logger.error('Cannot remove redundancy of %s.', server.host, err))
+      .catch(err => logger.error('Cannot remove redundancy of %s.', server.host, { err }))
 
     await follow.destroy({ transaction: t })
   })
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
 function getActorUrl (actor: MActorFull) {
   return getUrlFromWebfinger(actor.preferredUsername + '@' + actor.getHost())
     .catch(err => {
-      logger.warn('Cannot get actor URL from webfinger, keeping the old one.', err)
+      logger.warn('Cannot get actor URL from webfinger, keeping the old one.', { err })
       return actor.url
     })
 }
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) {
       await generateHTMLPage(req, res, req.params.language)
       return
     } catch (err) {
-      logger.error('Cannot generate HTML page.', err)
+      logger.error('Cannot generate HTML page.', { err })
       return res.status(HttpStatusCode.INTERNAL_SERVER_ERROR_500).end()
     }
   }
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
 
     // Don't block the transaction
     instance.removeImage()
-      .catch(err => logger.error('Cannot remove actor image file %s.', instance.filename, err))
+      .catch(err => logger.error('Cannot remove actor image file %s.', instance.filename, { err }))
   }
 
   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>
 
     // Don't block the transaction
     instance.removeThumbnail()
-            .catch(err => logger.error('Cannot remove thumbnail file %s.', instance.filename, err))
+            .catch(err => logger.error('Cannot remove thumbnail file %s.', instance.filename, { err }))
   }
 
   static loadByFilename (filename: string, thumbnailType: ThumbnailType): Promise<MThumbnail> {
-- 
2.41.0