Fix incorrect error logs

diff --git a/server/controllers/api/server/follows.ts b/server/controllers/api/server/follows.ts
index 9557810b57d03a577733f2901ff3a6469fe9a210..37e8d88f75a6d7a282dc9b010518dba019edc63d 100644 (file)
--- 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 8ce2cd5d93b3a8088c12cee5c893662a0563e85b..6d8428d6627578f8e4155ce2b0aed421bbb73378 100644 (file)
--- 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 899d80c15e4ecd3fe873f43a8ca4a4e1b7c157f0..4fd9a4263d665fcf1d58b398dad6cfa05022a581 100644 (file)
--- 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 9d44ef4d1a2fdbad8f7a6b5f5634feb661e188f9..f2b3b2f4b33672052c05658d138e101526d14768 100644 (file)
--- 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 05c58cf19cc57b5bd494b9b82f37dffb0a06ad54..f33bd31799b302a904591cb2fdcfb7d4cbcae1f6 100644 (file)
--- 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> {