Skip to content

foodtype and error logging #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 29, 2017
Merged

foodtype and error logging #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Loop/Extensions/MealBolusNightscoutTreatment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ import HealthKit
extension MealBolusNightscoutTreatment {
public convenience init(carbEntry: CarbEntry) {
let carbGrams = carbEntry.quantity.doubleValue(for: HKUnit.gram())
self.init(timestamp: carbEntry.startDate, enteredBy: "loop://\(UIDevice.current.name)", id: carbEntry.externalID, carbs: lround(carbGrams), absorptionTime: carbEntry.absorptionTime)
self.init(timestamp: carbEntry.startDate, enteredBy: "loop://\(UIDevice.current.name)", id: carbEntry.externalID, carbs: lround(carbGrams), absorptionTime: carbEntry.absorptionTime, foodType: carbEntry.foodType)
}
}
13 changes: 9 additions & 4 deletions Loop/Extensions/NightscoutUploader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import NightscoutUploadKit


extension NightscoutUploader: CarbStoreSyncDelegate {
static let logger = DiagnosticLogger.shared!.forCategory("NightscoutUploader")


public func carbStore(_ carbStore: CarbStore, hasEntriesNeedingUpload entries: [CarbEntry], completion: @escaping ([String]) -> Void) {
let nsCarbEntries = entries.map({ MealBolusNightscoutTreatment(carbEntry: $0)})

Expand All @@ -21,7 +24,8 @@ extension NightscoutUploader: CarbStoreSyncDelegate {
case .success(let ids):
// Pass new ids back
completion(ids)
case .failure:
case .failure(let error):
NightscoutUploader.logger.error(error)
completion([])
}
}
Expand All @@ -32,7 +36,8 @@ extension NightscoutUploader: CarbStoreSyncDelegate {
let nsCarbEntries = entries.map({ MealBolusNightscoutTreatment(carbEntry: $0)})

modifyTreatments(nsCarbEntries) { (error) in
if error != nil {
if let error = error {
NightscoutUploader.logger.error(error)
completion([])
} else {
completion(entries.map { $0.externalID ?? "" } )
Expand All @@ -43,8 +48,8 @@ extension NightscoutUploader: CarbStoreSyncDelegate {
public func carbStore(_ carbStore: CarbStore, hasDeletedEntries ids: [String], completion: @escaping ([String]) -> Void) {

deleteTreatmentsById(ids) { (error) in
if error != nil {
completion([])
if let error = error {
NightscoutUploader.logger.error(error)
} else {
completion(ids)
}
Expand Down
3 changes: 2 additions & 1 deletion Loop/Managers/DeviceDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,8 @@ extension DeviceDataManager: DoseStoreDelegate {
case .success(let objects):
completionHandler(objects)
case .failure(let error):
self.logger.addError(error, fromSource: "NightscoutUploadKit")
let logger = DiagnosticLogger.shared!.forCategory("NightscoutUploader")
logger.error(error)
completionHandler([])
}
}
Expand Down