Fix logging in feature migration tool (#4485)

wireapp · Mar 7, 2025 · 93d58b6 · 93d58b6
1 parent 6036dde
commit 93d58b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/changelog.d/0-release-notes/feature-migration-tool-fix b/changelog.d/0-release-notes/feature-migration-tool-fix
@@ -0,0 +1 @@
+Fix logging of skipped entries in feature migration tool
diff --git a/tools/db/migrate-features/src/Work.hs b/tools/db/migrate-features/src/Work.hs
@@ -382,17 +382,18 @@ writeFeatures
             setMigrationState team_id MigrationCompleted
         )
         (setMigrationState team_id MigrationNotStarted)
-      modifyIORef countRef $ \(migrated, skipped) ->
-        if state == MigrationNotStarted
-          then (migrated + 1, skipped)
-          else (migrated, skipped + 1)
-
-      (migrated, skipped) <- readIORef countRef
-      when ((migrated + skipped) `mod` opts.granularity == 0) $ do
-        Log.info opts.logger $
-          Log.msg ("migration progress" :: ByteString)
-            . Log.field "migrated" migrated
-            . Log.field "skipped" skipped
+
+    modifyIORef countRef $ \(migrated, skipped) ->
+      if state == MigrationNotStarted
+        then (migrated + 1, skipped)
+        else (migrated, skipped + 1)
+
+    (migrated, skipped) <- readIORef countRef
+    when ((migrated + skipped) `mod` opts.granularity == 0) $ do
+      Log.info opts.logger $
+        Log.msg ("migration progress" :: ByteString)
+          . Log.field "migrated" migrated
+          . Log.field "skipped" skipped
 
 ----------------------------------------------------------------------------
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix logging of skipped entries in feature migration tool