Refactored to use new logging and remove os.log. (#243)

CoEpi/api/AlamofireLogger.swift

@@ -1,26 +1,23 @@
 import Alamofire
-import os.log
 import Foundation
 
 final class AlamofireLogger: EventMonitor {
 
     func requestDidResume(_ request: Request) {
         let body = request.request.flatMap { $0.httpBody.map { String(decoding: $0, as: UTF8.self) } } ?? "None"
-        os_log("Request Started: %{public}@, body: %{public}@", log: networkingLog, type: .debug, "\(request)",
-            "\(body)")
+
+        log.d("Request Started: \(request), body: \(body)")
     }
 
     func request<Value>(_ request: DataRequest, didParseResponse response: DataResponse<Value, Error>) {
-        os_log("Response Received: %{public}@", log: networkingLog, type: .debug, "\(request)")
+        log.d("Request Received: \(request)")
     }
 
     func request(_ request: DataRequest, didParseResponse response: DataResponse<Data?, AFError>) {
-        os_log("Response Received (unserialized): %{public}@", log: networkingLog, type: .debug,
-               response.debugDescription)
+        log.d("Request Received (unserialized):  \(response.debugDescription)")
     }
 
     func requestDidFinish(_ request: Request) {
-        os_log("Request did finish: %{public}@", log: networkingLog, type: .debug,
-               request.response.debugDescription)
+        log.d("Request did finish: \(request.response.debugDescription)")
     }
 }

CoEpi/bg task/BackgroundTask.swift

@@ -1,6 +1,5 @@
 import Foundation
 import BackgroundTasks
-import os.log
 import RxSwift
 
 /// Long running background task

CoEpi/bg task/BackgroundTaskScheduler.swift

@@ -1,6 +1,5 @@
 import UIKit
 import BackgroundTasks
-import os.log
 
 /// Registers and schedules background processing tasks
 class BackgroundTaskScheduler {
@@ -26,20 +25,20 @@ class BackgroundTaskScheduler {
     }
 
     private func handleTask(task: BGProcessingTask) {
-        os_log("handleTask: ", log: servicesLog, type: .debug, "\(task)")
+        log.d("handleTask: \(task)")
 
         schedule(delay: self.task.scheduleInterval)
 
         self.task.execute(task: task)
 
         task.expirationHandler = {
             task.setTaskCompleted(success: false)
-            os_log("Background task expired", log: servicesLog, type: .debug)
+            log.d("Background task expired")
         }
     }
 
     private func schedule(delay: TimeInterval) {
-        os_log("Scheduling BG task. Delay: %{public}@", log: servicesLog, type: .debug, "\(delay)")
+        log.d("Scheduling BG task. Delay: \(delay)")
 
         let request = BGProcessingTaskRequest(identifier: task.identifier)
         request.earliestBeginDate = Date(timeIntervalSinceNow: delay)
@@ -49,7 +48,7 @@ class BackgroundTaskScheduler {
           // TODO flag to use bg thread. Or maybe just use always thread.
           try BGTaskScheduler.shared.submit(request)
         } catch let e {
-          os_log("Unable to submit task: %{public}@, error: %{public}@", log: servicesLog, type: .debug, "\(request)", "\(e)")
+            log.e("Unable to submit task: \(request), error: \(e)")
         }
     }
 }

CoEpi/bg task/alerts/FetchAlertsBackgroundTask.swift

@@ -1,5 +1,4 @@
 import RxSwift
-import os.log
 import BackgroundTasks
 import Action
 
@@ -25,7 +24,7 @@ class FetchAlertsBackgroundTask: BackgroundTask {
     }
 
     func execute(task: BGProcessingTask) {
-        os_log("Starting fetch alerts bg task...", log: servicesLog, type: .debug)
+        log.d("Starting fetch alerts bg task...")
 
         fetchAlertsAction.execute()
     }

CoEpi/ble/BleAdapter.swift

@@ -1,7 +1,6 @@
 import Foundation
 import TCNClient
 import RxSwift
-import os.log
 
 class BleAdapter {
     private let tcnService: TCNBluetoothService
@@ -12,7 +11,7 @@ class BleAdapter {
     init(tcnGenerator: TcnGenerator) {
         tcnService = TCNBluetoothService(tcnGenerator: { [myTcn] in
             let tcnResult = tcnGenerator.generateTcn()
-            os_log("Generated TCN: %{public}@", type: .error, "\(tcnResult)")
+            log.d("Generated TCN: \(tcnResult)")
 
             return {
                 switch tcnResult {
@@ -28,7 +27,7 @@ class BleAdapter {
             discovered.onNext(data)
         }) { error in
             // TODO What kind of errors? Should we notify the user?
-            os_log("TCN service error: %{public}@", type: .error, "\(error)")
+            log.e("TCN service error: \(error)")
         }
 
         tcnService.start()

CoEpi/cross/PeriodicAlertsFetcher.swift

@@ -1,6 +1,5 @@
 import Foundation
 import RxSwift
-import os.log
 
 class PeriodicAlertsFetcher {
     private let disposeBag = DisposeBag()

CoEpi/cross/ReportsHandler.swift

@@ -1,5 +1,4 @@
 import Foundation
-import os.log
 
 protocol MatchingReportsHandler {
     func handleMatchingReports(reports: [ReceivedCenReport])
@@ -25,7 +24,7 @@ class MatchingReportsHandlerImpl: MatchingReportsHandler {
             notifiyNewAlerts(count: insertedCount)
         }
 
-        os_log("Alerts update task finished. Saved new reports: %{public}d", log: servicesLog, type: .debug, insertedCount)
+        log.d("Alerts update task finished. Saved new reports: \(insertedCount)")
     }
 
     private func notifiyNewAlerts(count: Int) {

CoEpi/cross/ScannedCensHandler.swift

@@ -1,5 +1,4 @@
 import Foundation
-import os.log
 import RxSwift
 
 class ScannedCensHandler {
@@ -20,16 +19,16 @@ class ScannedCensHandler {
             .distinctUntilChanged()
 
             .subscribe(onNext: { [tcnsRecorder] data in
-                os_log("Observed CEN: %{public}@", log: bleLog, "\(data.toHex())")
+                log.d("Observed CEN: \(data.toHex())")
 
                 let res = tcnsRecorder.recordTcn(tcn: data)
 
                 if (!res.isSuccess()) {
-                    os_log("Error recording TCN: %{public}@", log: bleLog, type: .debug, "\(res)")
+                    log.e("Error recording TCN: \(res)")
                 }
 
             }, onError: { error in
-                os_log("Error in central cen observer: %{public}@", log: bleLog, error.localizedDescription)
+                log.e("Error in central cen observer: \(error.localizedDescription)")
             }).disposed(by: disposeBag)
     }
 

CoEpi/dao/AlertDao.swift

@@ -1,5 +1,4 @@
 import Foundation
-import os.log
 import RealmSwift
 import RxSwift
 
@@ -54,10 +53,10 @@ class RealmAlertDao: AlertDao, RealmDao {
     }
 
     func delete(alert: Alert) {
-        os_log("ACKing alert: %{public}@", type: .debug, "\(alert)")
+        log.d("ACKing alert: \(alert)")
 
         guard let realmAlert = findAlertBy(id: alert.id) else {
-            os_log("Couldn't find alert to delete: %{public}@", type: .error, "\(alert)")
+            log.e("Couldn't find alert to delete: \(alert)")
             return
         }
 

CoEpi/dao/RealmCENReportDao.swift

@@ -1,7 +1,6 @@
 import Foundation
 import RealmSwift
 import RxSwift
-import os.log
 
 // TODO remove, move functionality to RawAlertDao
 protocol CENReportDao {
@@ -38,24 +37,24 @@ class RealmCENReportDao: CENReportDao, RealmDao {
     func insert(report: ReceivedCenReport) -> Bool {
         let result = realm.objects(RealmCENReport.self).filter("id = %@", report.report.id)
         if result.count == 0 {
-            os_log("Report didn't exist in db, inserting: %{public}@", type: .debug, report.description)
+            log.d("Report didn't exist in db, inserting: \(report.description)")
             let newCENReport = RealmCENReport(report)
             write {
                 realm.add(newCENReport)
             }
             return true
         } else {
             //duplicate entry: skipping
-            os_log("Report already in db, id = %{public}@", type: .debug, report.report.id)
+            log.d("Report already in db, id = \(report.report.id)")
             return false
         }
     }
 
     func delete(report: ReceivedCenReport) {
-        os_log("ACKing report: %{public}@", type: .debug, "\(report)")
+        log.d("ACKing report: \(report)")
 
         guard let realmReport = findReportBy(id: report.report.id) else {
-            os_log("Couldn't find report to delete: %{public}@", type: .error, "\(report)")
+            log.e("Couldn't find report to delete: \(report)")
             return
         }
 

CoEpi/native/LibResult.swift

@@ -1,5 +1,4 @@
 import Foundation
-import os.log
 
 struct LibResult<T: Decodable>: Decodable {
     let status: Int
@@ -43,8 +42,7 @@ extension Unmanaged where Instance == CFString {
         let resultValue: CFString = takeRetainedValue()
         let resultString = resultValue as String
 
-        os_log("Deserializing native core result: %{public}@", log: servicesLog,
-               type: .debug, "\(resultString)")
+        log.d("Deserializing native core result: \(resultString)")
 
         // TODO review safety of utf-8 force unwrap
         let data = resultString.data(using: .utf8)!

CoEpi/repo/AlertRepo.swift

@@ -1,7 +1,6 @@
 import Foundation
 import RxCocoa
 import RxSwift
-import os.log
 
 protocol AlertRepo {
     var alerts: Observable<[Alert]> { get }
@@ -45,13 +44,13 @@ class AlertRepoImpl: AlertRepo {
                 // TODO so we have to update "last fetched time segment" only if alerts save was success
                 // TODO NOTE that storage will likely be moved to Rust. Let's wait until this is cleared.
                 if alertDao.insert(alert: alert) {
-                    os_log("Inserted new alert: %{alert}@", log: servicesLog, type: .debug, "\(alert)")
+                    log.d("Inserted new alert: \(alert)")
                 }
             }
             updateReportsStateSubject.accept(.success(data: ()))
 
         case .failure(let error):
-            os_log("Error fetching alerts: %{public}@", log: servicesLog, type: .debug, "\(error)")
+            log.e("Error fetching alerts: \(error)")
             updateReportsStateSubject.accept(OperationState.failure(error: error))
         }
 

CoEpi/repo/SymptomRepo.swift

@@ -1,6 +1,5 @@
 import Foundation
 import RxSwift
-import os.log
 
 protocol SymptomRepo {
     func symptoms() -> [Symptom]

CoEpi/ui/alerts/AlertsViewModel.swift

@@ -1,7 +1,6 @@
 import Dip
 import RxCocoa
 import RxSwift
-import os.log
 import Foundation
 
 class AlertsViewModel {
@@ -22,7 +21,7 @@ class AlertsViewModel {
 
         updateStatusText = alertRepo.updateReportsState
             .do(onNext: { result in
-                os_log("Got alerts result in view model: %{public}@", log: servicesLog, type: .debug, "\(result)")
+                log.d("Got alerts result in view model: \(result)")
             })
             .filter { $0.shouldShowText() }
             .map { $0.asText() }

CoEpi/ui/home/HomeViewModel.swift

@@ -1,5 +1,4 @@
 import RxSwift
-import os.log
 
 class HomeViewModel {
     let title = L10n.Ux.Home.title
@@ -12,7 +11,7 @@ class HomeViewModel {
         self.rootNav = rootNav
 
         startPermissions.granted.subscribe(onNext: { granted in
-            os_log("Start permissions granted: %{public}@", log: servicesLog, type: .debug, "\(granted)")
+            log.d("Start permissions granted: \(granted)")
         }).disposed(by: disposeBag)
 
         startPermissions.request()

CoEpi/ui/notifications/AppBadgeUpdater.swift

@@ -1,6 +1,5 @@
 import Foundation
 import UserNotifications
-import os.log
 import UIKit
 
 protocol AppBadgeUpdater {
@@ -22,7 +21,7 @@ class AppBadgeUpdaterImpl: AppBadgeUpdater {
         else { return }
 
         DispatchQueue.main.async {
-            os_log("Updating app badge: %{public}@", log: servicesLog, type: .debug, "\(number)")
+            log.d("Updating app badge: \(number)")
             UIApplication.shared.applicationIconBadgeNumber = number
         }
     }

CoEpi/ui/notifications/NotificationShower.swift

@@ -1,5 +1,4 @@
 import UIKit
-import os.log
 
 protocol NotificationShower {
     func showNotification(data: NotificationData)
@@ -25,7 +24,7 @@ class NotificationShowerImpl: NotificationShower {
     }
 
     private func showNotification(data: NotificationData, canPlaySound: Bool) {
-        os_log("Showing notification", log: servicesLog, type: .debug)
+        log.d("Showing notification")
 
         let content = UNMutableNotificationContent()
         content.title = data.title

CoEpi/ui/notifications/NotificationsDelegate.swift

@@ -1,6 +1,5 @@
 import UIKit
 import UserNotifications
-import os.log
 
 class NotificationsDelegate: NSObject, UNUserNotificationCenterDelegate {
 
@@ -26,7 +25,7 @@ class NotificationsDelegate: NSObject, UNUserNotificationCenterDelegate {
         let identifierStr = response.notification.request.identifier
 
         guard let identifier = NotificationId(rawValue: identifierStr) else {
-            os_log("Selected notification with unknown id: %{public}@", log: servicesLog, type: .debug, identifierStr)
+            log.d("Selected notification with unknown id: \(identifierStr)")
             return
         }
 

CoEpi/ui/permissions/StartPermissions.swift

@@ -1,7 +1,6 @@
 import UIKit
 import RxSwift
 import RxCocoa
-import os.log
 
 protocol StartPermissions {
     var granted: Observable<Bool> { get }
@@ -21,7 +20,7 @@ class StartPermissionsImpl: StartPermissions {
     func request() {
         UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound]) { (granted, error) in
             if let error = error {
-                os_log("Error requesting permission: %{public}@", log: servicesLog, type: .debug, "\(error)")
+                log.e("Error requesting permission: \(error)")
             }
             self.grantedSubject.accept(granted)
         }

CoEpi/ui/symptomReport/FollowUp/Cough/CoughDaysViewModel.swift

@@ -1,7 +1,6 @@
 import Dip
 import RxCocoa
 import RxSwift
-import os.log
 
 class CoughDaysViewModel {
     private let symptomFlowManager: SymptomFlowManager
@@ -30,7 +29,7 @@ class CoughDaysViewModel {
                 symptomFlowManager.setCoughDays(.some(SymptomInputs.Days(value: days))).expect()
             } else {
                 // TODO handle
-                os_log("Invalid input: %{public}@ TODO handle", log: servicesLog, type: .debug, "\(daysStr)")
+                log.d("Invalid input: \(daysStr) TODO handle")
             }
         }
         daysIsEmpty.accept(daysStr.isEmpty)

CoEpi/ui/symptomReport/FollowUp/Cough/CoughHowViewModel.swift

@@ -1,7 +1,6 @@
 import Dip
 import RxCocoa
 import RxSwift
-import os.log
 
 class CoughHowViewModel {
     private let symptomFlowManager: SymptomFlowManager

CoEpi/ui/symptomReport/FollowUp/Cough/CoughTypeViewModel.swift

@@ -1,7 +1,6 @@
 import Dip
 import RxCocoa
 import RxSwift
-import os.log
 
 class CoughTypeViewModel {
     private let symptomFlowManager: SymptomFlowManager