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

Tweak to ASCII reader warning suppression

Browse source 
Warnings in the ASCII reader so far remained suppressed even when an
input file changed. It's helpful to learn about problems in the data
when putting in place new data files, so this isn't great. This change
maintains the existing warning suppression while processing a file,
but re-enables warnings after updates to a file.

Also includes minor comment clarifications, and maintains the
not-so-great code duplication between the ASCII and Config readers
until we refactor this properly.
This commit is contained in:
Christian Kreibich 2019-05-28 18:44:02 -07:00
parent c25520cf3f
commit c21a411bfb
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/input/readers/ascii/Ascii.cc
View file

@ -305,11 +305,15 @@ bool Ascii::DoUpdate()
// no change
return true;
// Warn again in case of trouble if the file changes. The comparison to 0
// is to suppress an extra warning that we'd otherwise get on the initial
// inode assignment.
if ( ino != 0 )
suppress_warnings = false;
mtime = sb.st_mtime;
ino = sb.st_ino;
// file changed. reread.
// fallthrough
// File changed. Fall through to re-read.
}
case MODE_MANUAL:
@ -470,8 +474,8 @@ bool Ascii::DoHeartbeat(double network_time, double current_time)
case MODE_REREAD:
case MODE_STREAM:
Update(); // call update and not DoUpdate, because update
// checks disabled.
Update(); // Call Update, not DoUpdate, because Update
// checks the "disabled" flag.
break;
default:

14
src/input/readers/config/Config.cc
View file

@ -151,11 +151,15 @@ bool Config::DoUpdate()
// no change
return true;
// Warn again in case of trouble if the file changes. The comparison to 0
// is to suppress an extra warning that we'd otherwise get on the initial
// inode assignment.
if ( ino != 0 )
suppress_warnings = false;
mtime = sb.st_mtime;
ino = sb.st_ino;
// file changed. reread.
// fallthrough
// File changed. Fall through to re-read.
}
case MODE_MANUAL:
@ -309,8 +313,8 @@ bool Config::DoHeartbeat(double network_time, double current_time)
case MODE_REREAD:
case MODE_STREAM:
Update(); // call update and not DoUpdate, because update
// checks disabled.
Update(); // Call Update, not DoUpdate, because Update
// checks the "disabled" flag.
break;
default: