diff --git a/Sources/XXMessengerClient/Utils/LogMessage.swift b/Sources/XXMessengerClient/Utils/LogMessage.swift index 7188f9b03f443bc21e4c191e711da353bfcf35a7..7169d953a60109e654c6d7063cbbe3b1857394cd 100644 --- a/Sources/XXMessengerClient/Utils/LogMessage.swift +++ b/Sources/XXMessengerClient/Utils/LogMessage.swift @@ -15,8 +15,11 @@ extension LogMessage { public static func parse(_ string: String) -> LogMessage { let level: Logger.Level let text: String - 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 pattern = #"^([A-Z]+)( \d{4}/\d{2}/\d{2})?( \d{1,2}:\d{2}:\d{2}\.\d+)? (.*)"# + let regex = try! NSRegularExpression( + pattern: pattern, + options: .dotMatchesLineSeparators + ) let stringRange = NSRange(location: 0, length: string.utf16.count) if let match = regex.firstMatch(in: string, range: stringRange) { var groups: [Int: String] = [:] diff --git a/Tests/XXMessengerClientTests/Utils/LogMessageTests.swift b/Tests/XXMessengerClientTests/Utils/LogMessageTests.swift index ba6dbe28d5e67d0754fd586a6d3db2dcda107e95..bbea8995439aec672f0ebddf778484cf7889f0ee 100644 --- a/Tests/XXMessengerClientTests/Utils/LogMessageTests.swift +++ b/Tests/XXMessengerClientTests/Utils/LogMessageTests.swift @@ -55,4 +55,17 @@ final class LogMessageTests: XCTestCase { LogMessage(level: .info, text: "Informing...") ) } + + func testParsingMultilineMessage() { + XCTAssertNoDifference( + LogMessage.parse(""" + ERROR 2022/10/04 23:51:15.021658 First line + Second line + """), + LogMessage(level: .error, text: """ + First line + Second line + """) + ) + } }