Skip to content

Commit 612c47a

Browse files
patrickniepelpatrickniepel
committed
Merge branch '309-improve-log-system' into 'master'
Resolve "Improve log system" Closes #309 See merge request pace/mobile/ios/pace-cloud-sdk!350
2 parents 22452d7 + 94030dc commit 612c47a

File tree

6 files changed

+7
-79
lines changed

6 files changed

+7
-79
lines changed

‎PACECloudSDK.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -810,10 +810,7 @@
810810
6AB865762733ED4500EB4092 /* ShareTextResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AB865752733ED4500EB4092 /* ShareTextResult.swift */; };
811811
6ACBC03426FDA1AC00E6AC05 /* Data+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B970A082542D9BA0072F6BA /* Data+Extension.swift */; };
812812
6ACBC03826FDC76300E6AC05 /* LoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ACBC03726FDC76300E6AC05 /* LoggerTests.swift */; };
813-
6ACBC08326FE0FC300E6AC05 /* Logger+Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ACBC08226FE0FC300E6AC05 /* Logger+Notification.swift */; };
814-
6ACBC08626FE0FF300E6AC05 /* Logger+Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ACBC08526FE0FF300E6AC05 /* Logger+Notification.swift */; };
815813
6ACBC08926FE127300E6AC05 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BB1443225388108004E9F63 /* Logger.swift */; };
816-
6ACBC08B26FE128F00E6AC05 /* Logger+Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ACBC08A26FE128F00E6AC05 /* Logger+Notification.swift */; };
817814
8414A59125CC0D370077E050 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8414A59025CC0D370077E050 /* User.swift */; };
818815
8418E22C25B1AD2600D3722B /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B76F7562576468F008D8F9A /* API.swift */; };
819816
8418E24025B1B83800D3722B /* POI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C5E706258A149200E5B20B /* POI.swift */; };
@@ -1576,9 +1573,6 @@
15761573
6AB865732733EC9300EB4092 /* ShareTextRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareTextRequest.swift; sourceTree = "<group>"; };
15771574
6AB865752733ED4500EB4092 /* ShareTextResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareTextResult.swift; sourceTree = "<group>"; };
15781575
6ACBC03726FDC76300E6AC05 /* LoggerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggerTests.swift; sourceTree = "<group>"; };
1579-
6ACBC08226FE0FC300E6AC05 /* Logger+Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+Notification.swift"; sourceTree = "<group>"; };
1580-
6ACBC08526FE0FF300E6AC05 /* Logger+Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+Notification.swift"; sourceTree = "<group>"; };
1581-
6ACBC08A26FE128F00E6AC05 /* Logger+Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+Notification.swift"; sourceTree = "<group>"; };
15821576
8414A59025CC0D370077E050 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
15831577
841A3EA825B9C8D40065284A /* FuelingAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FuelingAPI.swift; sourceTree = "<group>"; };
15841578
841A3EA925B9C8D40065284A /* FuelingAPIService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FuelingAPIService.swift; sourceTree = "<group>"; };
@@ -1882,7 +1876,6 @@
18821876
3B79FAB626C15D4100C0278F /* BundleUserAgent+Extension.swift */,
18831877
1785C96126943B3D0041A20E /* IDKit+WatchSDK.swift */,
18841878
17BB0CDA268CCED6009D4755 /* Info.plist */,
1885-
6ACBC08526FE0FF300E6AC05 /* Logger+Notification.swift */,
18861879
17BB0CD9268CCED6009D4755 /* PACECloudWatchSDK.h */,
18871880
17BB0D08268CCF53009D4755 /* PACECloudWatchSDK+API.swift */,
18881881
1718B16926B02FA20044146C /* PACECloudWatchSDK+Kits.swift */,
@@ -2782,7 +2775,6 @@
27822775
isa = PBXGroup;
27832776
children = (
27842777
3BB1443225388108004E9F63 /* Logger.swift */,
2785-
6ACBC08226FE0FC300E6AC05 /* Logger+Notification.swift */,
27862778
6A2F492A27044AE1004497B2 /* SDKLogger.swift */,
27872779
);
27882780
path = Logger;
@@ -3510,7 +3502,6 @@
35103502
923ED19425D7A991001444C3 /* PACECloudSlimSDK+API.swift */,
35113503
1718B16726B02F690044146C /* PACECloudSlimSDK+Kits.swift */,
35123504
92EDDDD825A7460D00E480F4 /* POIKit+Slim.swift */,
3513-
6ACBC08A26FE128F00E6AC05 /* Logger+Notification.swift */,
35143505
);
35153506
path = PACECloudSlimSDK;
35163507
sourceTree = "<group>";
@@ -3806,7 +3797,6 @@
38063797
3B9036AA27D0B9390011E063 /* POIResponse.swift in Sources */,
38073798
3B79FA8326C15BE700C0278F /* InvalidationTokenCache.swift in Sources */,
38083799
6ACBC03426FDA1AC00E6AC05 /* Data+Extension.swift in Sources */,
3809-
6ACBC08626FE0FF300E6AC05 /* Logger+Notification.swift in Sources */,
38103800
17BB0D01268CCF13009D4755 /* PayAPIGetReceiptByFormat.swift in Sources */,
38113801
3B79FA8126C15BE400C0278F /* RegionalPricesResponse.swift in Sources */,
38123802
17B4E54A26D39C9C00AEAF13 /* UserAPIUpdateUserPhone.swift in Sources */,
@@ -4295,7 +4285,6 @@
42954285
9A906BA9284637D700463618 /* PCPayPRN.swift in Sources */,
42964286
8447A3CB25CAAE750095BEF1 /* UserAPICreateUserPassword.swift in Sources */,
42974287
3B879A99268210FF00D400B4 /* IDKit+API+TokenHandling.swift in Sources */,
4298-
6ACBC08326FE0FC300E6AC05 /* Logger+Notification.swift in Sources */,
42994288
9A906B9D284637D700463618 /* PCPayPaymentMethodRMCCreateRequest.swift in Sources */,
43004289
3B2FB1BB2844EB2800E8CD0C /* PCUserEmailRequest.swift in Sources */,
43014290
3B987073268E06AE00A0458F /* CloseResult.swift in Sources */,
@@ -4886,7 +4875,6 @@
48864875
92EDDC1225A7270300E480F4 /* URLDecomposer.swift in Sources */,
48874876
92EDDC0825A7270300E480F4 /* URLRequestBuilder.swift in Sources */,
48884877
8418E29725B1B85E00D3722B /* Coding.swift in Sources */,
4889-
6ACBC08B26FE128F00E6AC05 /* Logger+Notification.swift in Sources */,
48904878
3BABEFF127C8E878002256CB /* SessionCache.swift in Sources */,
48914879
3B9B2A6327B65AD10099EA37 /* CofuGasStation.swift in Sources */,
48924880
92EDDC1F25A7270300E480F4 /* AppViewController.swift in Sources */,

‎PACECloudSDK/Utils/Logger/Logger+Notification.swift‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎PACECloudSDK/Utils/Logger/Logger.swift‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ open class Logger {
7575
let timestampLog = "\(timestamp) \(singleMessagelog)"
7676
todaysLogs.append(timestampLog)
7777
}
78+
79+
syncFiles()
7880
}
7981
}
8082

@@ -84,7 +86,6 @@ open class Logger {
8486
return
8587
}
8688

87-
syncFiles()
8889
createExportLogs(completion: completion)
8990
}
9091

@@ -95,7 +96,7 @@ open class Logger {
9596
}
9697

9798
loggingQueue.async {
98-
let sortedLogs = sortedLogs(persistedLogs() + todaysLogs)
99+
let sortedLogs = sortedLogs(persistedLogs())
99100
completion(sortedLogs.filter { !$0.isEmpty })
100101
}
101102
}
@@ -113,7 +114,6 @@ open class Logger {
113114

114115
public static func deleteLogs(completion: (() -> Void)? = nil) {
115116
loggingQueue.async {
116-
todaysLogs = []
117117
let currentLogFiles = self.currentLogFiles()
118118
currentLogFiles.forEach {
119119
deleteFile(with: $0)
@@ -127,13 +127,11 @@ extension Logger {
127127
static func optIn() {
128128
if PACECloudSDK.shared.isLoggingEnabled {
129129
createLogsDirectory()
130-
addDidEnterBackgroundObserver()
131130
}
132131
}
133132

134133
static func optOut() {
135134
deleteLogs()
136-
removeDidEnterBackgroundObserver()
137135
}
138136
}
139137

@@ -154,7 +152,7 @@ private extension Logger {
154152
/// Persists the logs of today
155153
static func syncFiles() {
156154
loggingQueue.async {
157-
guard !todaysLogs.isEmpty else { return }
155+
guard !todaysLogs.isEmpty, PACECloudSDK.shared.config != nil else { return }
158156

159157
guard let todaysFileUrl = fileUrl(for: Date()) else {
160158
w("[Logger] Couldn't sync files. Invalid file.")
@@ -480,10 +478,3 @@ private extension Logger {
480478
}
481479
}
482480
}
483-
484-
extension Logger {
485-
@objc
486-
static func handleDidEnterBackground() {
487-
syncFiles()
488-
}
489-
}

‎PACECloudSDKTests/Utils/LoggerTests.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class LoggerTests: XCTestCase {
105105
"\(dateString(daysAgo: 13)) [PACECloudSDK_TEST] IMPORT LOG 3"]
106106

107107
importLogs(logs)
108-
XCTAssertEqual(debugBundleFileNumber(), 3)
108+
XCTAssertEqual(debugBundleFileNumber(), 4)
109109
}
110110

111111
func testFileCountMultipleDaysOneWeekAgoExceedingMaxNumberOfFiles() {
@@ -354,7 +354,7 @@ class LoggerTests: XCTestCase {
354354
var exportedLogs: [String] = []
355355

356356
TestLogger.exportLogs { logs in
357-
exportedLogs = logs
357+
exportedLogs = logs.filter { !($0.contains("❌") || $0.contains("[API key]")) }
358358
expectation.fulfill()
359359
}
360360

@@ -417,7 +417,7 @@ class LoggerTests: XCTestCase {
417417

418418
do {
419419
let fileString: String = try String(contentsOfFile: fileURL.path, encoding: .utf8)
420-
let logsOfFile: [String] = fileString.components(separatedBy: "\n").filter { !$0.isEmpty }
420+
let logsOfFile: [String] = fileString.components(separatedBy: "\n").filter { !($0.isEmpty || ($0.contains("❌") || $0.contains("[API key]"))) }
421421
return logsOfFile
422422
} catch {
423423
XCTFail()

‎PACECloudSlimSDK/Logger+Notification.swift‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎PACECloudWatchSDK/Logger+Notification.swift‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)