diff --git a/CHANGES b/CHANGES index cccf707a8b..e87fb53556 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,14 @@ +2.6-357 | 2019-05-30 10:57:54 -0700 + + * Tweak to ASCII reader warning suppression (Christian Kreibich, Corelight) + + 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 change + maintains the existing warning suppression while processing a file, + but re-enables warnings after updates to a file. + 2.6-354 | 2019-05-29 09:46:19 -0700 * Add weird: "RDP_channels_requested_exceeds_max" (Vlad Grigorescu) diff --git a/VERSION b/VERSION index d5ac3ab285..365ea3c739 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-354 +2.6-357 diff --git a/src/input/readers/ascii/Ascii.cc b/src/input/readers/ascii/Ascii.cc index e2b4b81714..7003c519a0 100644 --- a/src/input/readers/ascii/Ascii.cc +++ b/src/input/readers/ascii/Ascii.cc @@ -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: diff --git a/src/input/readers/config/Config.cc b/src/input/readers/config/Config.cc index eca276281c..4f138c8828 100644 --- a/src/input/readers/config/Config.cc +++ b/src/input/readers/config/Config.cc @@ -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: