Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Ascii reader error changes - fix small bugs

Browse source 
The changes are now a bit more succinct with less code changes required.
Behavior is tested a little bit more thoroughly and a memory problem
when reading incomplete lines was fixed. ReadHeader also always directly
returns if header reading failed.

Error messages now are back to what they were before the change, if the
new behavior is not used.

I also tweaked the documentation text a bit.
This commit is contained in:
Johanna Amann 2017-03-03 12:40:37 -08:00
parent 5078159080
commit b6e6302b40
11 changed files with 187 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

34
scripts/base/frameworks/input/readers/ascii.bro
View file

@ -19,16 +19,32 @@ export {
## String to use for an unset &optional field.
const unset_field = Input::unset_field &redef;
## Choose if the ascii input reader should globally
## fail on invalid lines and continue parsing afterward.
## Individual readers can use a different value.
## Fail on invalid lines. If set to false, the ascii
## input reader will jump over invalid lines, reporting
## warnings in reporter.log. If set to true, errors in
## input lines will be handled as fatal errors for the
## reader thread; reading will abort immediately and
## an error will be logged to reporter.log.
## Invidivual readers can use a different value using
## the $config table.
## fail_on_invalid_lines = T was the default behavior
## untill Bro 2.5.
const fail_on_invalid_lines = F &redef;
## Set to true if you would like the old behavior of the
## ascii reader where the reader thread would die if any file
## errors occur (like permissions problems or file missing).
## The default behavior is to continue attempting to open and read
## the file even in light of problems.
## Individual readers can use a different value.
## Fail on file read problems. If set to true, the ascii
## input reader will fail when encountering any problems
## while reading a file different from invalid lines.
## Examples fur such problems are permission problems, or
## missing files.
## When set to false, these problems will be ignored. This
## has an especially big effect for the REREAD mode, which will
## seamlessly recover from read errors when a file is
## only temporarily inaccessible. For MANUAL or STREAM files,
## errors will most likely still be fatal since no automatic
## re-reading of the file is attempted.
## Invidivual readers can use a different value using
## the $config table.
## fail_on_file_problem = T was the default behavior
## untill Bro 2.5.
const fail_on_file_problem = F &redef;
}