From 3be2d72e7d34aa09dd1748c2eee246f08093322b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?=
 <57442769+gjedlicska@users.noreply.github.com>
Date: Tue, 18 Jun 2024 10:17:50 +0200
Subject: [PATCH] fix(objects): use proper seq log templating (#2384)

* fix(objects): use proper seq log templating

* fix(objects): log message temp variable
---
 packages/server/modules/core/rest/diffDownload.js | 8 +++++---
 packages/server/modules/core/rest/diffUpload.js   | 2 +-
 packages/server/modules/core/rest/upload.js       | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/server/modules/core/rest/diffDownload.js b/packages/server/modules/core/rest/diffDownload.js
index 81f91b1b1..e30308540 100644
--- a/packages/server/modules/core/rest/diffDownload.js
+++ b/packages/server/modules/core/rest/diffDownload.js
@@ -46,9 +46,11 @@ module.exports = (app) => {
           req.log.error(err, `App error streaming objects`)
         } else {
           req.log.info(
-            `Streamed ${childrenList.length} objects (size: ${
-              gzipStream.bytesWritten / 1000000
-            } MB)`
+            {
+              childCount: childrenList.length,
+              mbWritten: gzipStream.bytesWritten / 1000000
+            },
+            'Streamed {childCount} objects (size: {mbWritten} MB)'
           )
         }
       }
diff --git a/packages/server/modules/core/rest/diffUpload.js b/packages/server/modules/core/rest/diffUpload.js
index ef40dfe37..0d36226fd 100644
--- a/packages/server/modules/core/rest/diffUpload.js
+++ b/packages/server/modules/core/rest/diffUpload.js
@@ -26,7 +26,7 @@ module.exports = (app) => {
 
     const objectList = JSON.parse(req.body.objects)
 
-    req.log.info(`Diffing ${objectList.length} objects.`)
+    req.log.info({ objectCount: objectList.length }, 'Diffing {objectCount} objects.')
 
     const chunkSize = 1000
     const objectListChunks = chunk(objectList, chunkSize)
diff --git a/packages/server/modules/core/rest/upload.js b/packages/server/modules/core/rest/upload.js
index ceb06a8f3..b0992e03a 100644
--- a/packages/server/modules/core/rest/upload.js
+++ b/packages/server/modules/core/rest/upload.js
@@ -151,12 +151,13 @@ module.exports = (app) => {
 
           req.log.info(
             {
+              objectCount: objs.length,
               durationSeconds: (Date.now() - t0) / 1000,
               crtMemUsageMB: process.memoryUsage().heapUsed / 1024 / 1024,
               uploadedSizeMB: gunzippedBuffer.length / 1000000,
               requestDropped
             },
-            `Uploaded batch of ${objs.length} objects`
+            'Uploaded batch of {objectCount} objects'
           )
         })
       } else if (
@@ -240,12 +241,13 @@ module.exports = (app) => {
           await promise
           req.log.info(
             {
+              objectCount: objs.length,
               uploadedSizeMB: estimateStringMegabyteSize(buffer),
               durationSeconds: (Date.now() - t0) / 1000,
               crtMemUsageMB: process.memoryUsage().heapUsed / 1024 / 1024,
               requestDropped
             },
-            `Uploaded batch of ${objs.length} objects.`
+            'Uploaded batch of {objectCount} objects.'
           )
         })
       } else {