diff --git a/Sources/XXMessengerClient/Utils/LogMessage.swift b/Sources/XXMessengerClient/Utils/LogMessage.swift index 387c536a673ebc93b82c32375fa8810e965a8511..7188f9b03f443bc21e4c191e711da353bfcf35a7 100644 --- a/Sources/XXMessengerClient/Utils/LogMessage.swift +++ b/Sources/XXMessengerClient/Utils/LogMessage.swift @@ -15,7 +15,7 @@ extension LogMessage { public static func parse(_ string: String) -> LogMessage { let level: Logger.Level let text: String - let pattern = #"([A-Z]+) (.*)"# + let pattern = #"^([A-Z]+)( \d{4}/\d{2}/\d{2})?( \d{1,2}:\d{2}:\d{2}\.\d+)? (.*)$"# let regex = try! NSRegularExpression(pattern: pattern) let stringRange = NSRange(location: 0, length: string.utf16.count) if let match = regex.firstMatch(in: string, range: stringRange) { @@ -28,7 +28,7 @@ extension LogMessage { } } level = .fromString(groups[1]) - text = groups[2] ?? string + text = groups[4] ?? string } else { level = .notice text = string diff --git a/Tests/XXMessengerClientTests/Utils/LogMessageTests.swift b/Tests/XXMessengerClientTests/Utils/LogMessageTests.swift index c955e3039a12188a963e32bcfbcf3163982ea6c0..ba6dbe28d5e67d0754fd586a6d3db2dcda107e95 100644 --- a/Tests/XXMessengerClientTests/Utils/LogMessageTests.swift +++ b/Tests/XXMessengerClientTests/Utils/LogMessageTests.swift @@ -40,4 +40,19 @@ final class LogMessageTests: XCTestCase { LogMessage(level: .notice, text: "1234 Wrongly formatted") ) } + + func testParsingStripsDateTime() { + XCTAssertNoDifference( + LogMessage.parse("INFO 2022/10/04 Informing..."), + LogMessage(level: .info, text: "Informing...") + ) + XCTAssertNoDifference( + LogMessage.parse("INFO 23:36:55.755390 Informing..."), + LogMessage(level: .info, text: "Informing...") + ) + XCTAssertNoDifference( + LogMessage.parse("INFO 2022/10/04 23:36:55.755390 Informing..."), + LogMessage(level: .info, text: "Informing...") + ) + } }