Skip to content

Fix random crash bug #14

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

Open
zmokhtar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix random crash bug #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91746e0
Fix a bug where sometimes read does not return a full record even tho…
zmokhtar Mar 23, 2017
7676bf1
log a message when there are more fields than there are headers and i…
Feb 24, 2020
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
16 changes: 14 additions & 2 deletions src/main/java/com/thebuzzmedia/cloudfront/LogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,12 @@ public void parse(InputStream stream, ILogParserCallback callback)
int lfIndex = ArrayUtils.lastIndexOfNoCheck(LF, buffer, index,
length);

if (lfIndex == -1)
if (lfIndex == -1 && length < buffer.length / 2) {
// read did not return enough.
System.out.println("reading more without processing, (read() returned less than one record)");
index = length;
continue;
} else if (lfIndex == -1) {
throw new MalformedContentException(
"Could not find the \\n (LINE FEED) character after scanning "
+ length
Expand All @@ -227,7 +232,7 @@ public void parse(InputStream stream, ILogParserCallback callback)
+ " bytes). The log file is likely malformed or a single log entry line is so long it won't fit easily into the current read buffer. Consider making the buffer bigger by adjust the "
+ BUFFER_SIZE_PROPERTY_NAME
+ " system property.");

}
// Decode the buffer contents up to our LF terminator
char[] content = DecodingUtils.decode(buffer,
DecodingUtils.ASCII_CHARSET, index, lfIndex + 1);
Expand Down Expand Up @@ -410,6 +415,13 @@ protected void parseLogEntry(char[] line, int index, int length,
continue;
}

if (valueIndex > activeFieldIndices.size()) {
System.out.println("Error, line has more fields than it should at " + valueIndex +
" line: " + (new String(line)).substring(index, index+length));
skippedFieldPositionSet.add(valueIndex);
continue;
}

// Value belonged to an active field, so store it.
logEntryWrapper.setFieldValue(activeFieldIndices.get(valueIndex++)
.intValue(), token.getValue());
Expand Down