use oslog rather than print statements in models package
This commit is contained in:
@ -1,5 +1,8 @@
|
||||
import CoreData
|
||||
import Foundation
|
||||
import OSLog
|
||||
|
||||
let logger = Logger(subsystem: "app.omnivore", category: "models")
|
||||
|
||||
/// An `NSPersistentContainer` subclass that lives in the `Models` package so that
|
||||
/// the data model is looked for in the same package bundle (rather than the main bundle)
|
||||
|
||||
@ -197,11 +197,11 @@ public extension Sequence where Element == FeedItemDep {
|
||||
|
||||
do {
|
||||
try context.save()
|
||||
print("LinkedItems saved succesfully")
|
||||
logger.debug("LinkedItems saved succesfully")
|
||||
return linkedItems
|
||||
} catch {
|
||||
context.rollback()
|
||||
print("Failed to save LinkedItems: \(error.localizedDescription)")
|
||||
logger.debug("Failed to save LinkedItems: \(error.localizedDescription)")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@ -239,10 +239,10 @@ public extension LinkedItem {
|
||||
|
||||
do {
|
||||
try context.save()
|
||||
print("LinkedItem updated succesfully")
|
||||
logger.debug("LinkedItem updated succesfully")
|
||||
} catch {
|
||||
context.rollback()
|
||||
print("Failed to update LinkedItem: \(error.localizedDescription)")
|
||||
logger.debug("Failed to update LinkedItem: \(error.localizedDescription)")
|
||||
}
|
||||
}
|
||||
|
||||
@ -251,10 +251,10 @@ public extension LinkedItem {
|
||||
|
||||
do {
|
||||
try context.save()
|
||||
print("LinkedItem removed")
|
||||
logger.debug("LinkedItem removed")
|
||||
} catch {
|
||||
context.rollback()
|
||||
print("Failed to remove LinkedItem: \(error.localizedDescription)")
|
||||
logger.debug("Failed to remove LinkedItem: \(error.localizedDescription)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -59,11 +59,11 @@ public struct HighlightDep: Identifiable, Hashable, Codable {
|
||||
|
||||
do {
|
||||
try context.save()
|
||||
print("Highlight saved succesfully")
|
||||
logger.debug("Highlight saved succesfully")
|
||||
return highlight
|
||||
} catch {
|
||||
context.rollback()
|
||||
print("Failed to save Highlight: \(error.localizedDescription)")
|
||||
logger.debug("Failed to save Highlight: \(error.localizedDescription)")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,13 +4,14 @@ import Foundation
|
||||
import Models
|
||||
import OSLog
|
||||
|
||||
let logger = Logger(subsystem: "app.omnivore", category: "data-service")
|
||||
|
||||
public final class DataService: ObservableObject {
|
||||
public static var registerIntercomUser: ((String) -> Void)?
|
||||
public static var showIntercomMessenger: (() -> Void)?
|
||||
|
||||
public let appEnvironment: AppEnvironment
|
||||
let networker: Networker
|
||||
static let logger = Logger(subsystem: "app.omnivore", category: "data-service")
|
||||
|
||||
let persistentContainer: PersistentContainer
|
||||
var subscriptions = Set<AnyCancellable>()
|
||||
@ -48,7 +49,7 @@ public final class DataService: ObservableObject {
|
||||
do {
|
||||
try persistentContainer.viewContext.save()
|
||||
} catch {
|
||||
DataService.logger.debug("failed to delete objects")
|
||||
logger.debug("failed to delete objects")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -64,11 +64,11 @@ private struct ViewerInternal {
|
||||
|
||||
do {
|
||||
try context.save()
|
||||
DataService.logger.debug("Viewer saved succesfully")
|
||||
logger.debug("Viewer saved succesfully")
|
||||
return viewer
|
||||
} catch {
|
||||
context.rollback()
|
||||
DataService.logger.debug("Failed to save Viewer: \(error.localizedDescription)")
|
||||
logger.debug("Failed to save Viewer: \(error.localizedDescription)")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,11 +12,11 @@ struct InternalNewsletterEmail {
|
||||
|
||||
do {
|
||||
try context.save()
|
||||
DataService.logger.debug("NewsletterEmail saved succesfully")
|
||||
logger.debug("NewsletterEmail saved succesfully")
|
||||
return newsletterEmail
|
||||
} catch {
|
||||
context.rollback()
|
||||
DataService.logger.debug("Failed to save NewsletterEmail: \(error.localizedDescription)")
|
||||
logger.debug("Failed to save NewsletterEmail: \(error.localizedDescription)")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@ -36,11 +36,11 @@ extension Sequence where Element == InternalNewsletterEmail {
|
||||
|
||||
do {
|
||||
try context.save()
|
||||
DataService.logger.debug("NewsletterEmail saved succesfully")
|
||||
logger.debug("NewsletterEmail saved succesfully")
|
||||
return newsletterEmails
|
||||
} catch {
|
||||
context.rollback()
|
||||
DataService.logger.debug("Failed to save NewsletterEmail: \(error.localizedDescription)")
|
||||
logger.debug("Failed to save NewsletterEmail: \(error.localizedDescription)")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user