Merge pull request #259 from jasesuperhero/fix/wrong-background-conte…

…xt-for-exporting fix: wrong background context for exporting and filtering entities
kean · Jun 3, 2024 · fb1002a · fb1002a
2 parents 3258e4e + 2cf5997
commit fb1002a
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 2 deletions.
diff --git a/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo Companion iOS App.xcscheme b/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo Companion iOS App.xcscheme
@@ -49,6 +49,12 @@
             ReferencedContainer = "container:Pulse.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.ConcurrencyDebug 1"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo Companion watchOS App.xcscheme b/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo Companion watchOS App.xcscheme
@@ -63,6 +63,12 @@
             ReferencedContainer = "container:Pulse.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.ConcurrencyDebug 1"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo iOS.xcscheme b/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo iOS.xcscheme
@@ -49,6 +49,12 @@
             ReferencedContainer = "container:Pulse.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.ConcurrencyDebug 1"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo macOS.xcscheme b/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo macOS.xcscheme
@@ -50,6 +50,12 @@
             ReferencedContainer = "container:Pulse.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.ConcurrencyDebug 1"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo tvOS.xcscheme b/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo tvOS.xcscheme
@@ -50,6 +50,12 @@
             ReferencedContainer = "container:Pulse.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.ConcurrencyDebug 1"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Integration Examples iOS.xcscheme b/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Integration Examples iOS.xcscheme
@@ -50,6 +50,12 @@
             ReferencedContainer = "container:Pulse.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.ConcurrencyDebug 1"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Sources/Pulse/LoggerStore/LoggerStore.swift b/Sources/Pulse/LoggerStore/LoggerStore.swift
@@ -931,12 +931,12 @@ extension LoggerStore {
         defer { try? target.close() }
 
         // Remove unwanted messages
-        backgroundContext.performAndWait {
+        target.backgroundContext.performAndWait {
             try? target._removeUnwantedExportableContent(for: options)
         }
 
         // Copy required blobs
-        backgroundContext.performAndWait {
+        target.backgroundContext.performAndWait {
             try? _exportBlobs(to: target)
         }