Skip to content

Record all non-garbage Pod responses #571

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
ps2 merged 3 commits into from
Dec 23, 2019
Merged

Record all non-garbage Pod responses #571

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05690c9
Record pod responses before trying to parse to ensure they get logged
itsmojo Dec 2, 2019
0d50be5
Improved logic to avoid logging partial messages and to mark failed r…
itsmojo Dec 11, 2019
b05ac1c
Don't do any logging for a garbage message
itsmojo Dec 23, 2019
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
12 changes: 10 additions & 2 deletions OmniKit/MessageTransport/MessageTransport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class PodMessageTransport: MessageTransport {
}

// Assemble fragmented message from multiple packets
let response = try { () throws -> Message in
let response = try { () throws -> Message in
var responseData = responsePacket.data
while true {
do {
Expand All @@ -258,9 +258,17 @@ class PodMessageTransport: MessageTransport {
throw PodCommsError.unexpectedPacketType(packetType: conPacket.packetType)
}
responseData += conPacket.data
} catch MessageError.invalidCrc {
// throw the error without any logging for a garbage message
throw MessageError.invalidCrc
} catch let error {
// log any other non-garbage messages that generate errors
log.debug("Error Recv(Hex): %@", responseData.hexadecimalString)
messageLogger?.didReceive(responseData)
throw error
}
}
}()
}()

ackUntilQuiet()

Expand Down