From: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
Date: Tue, 7 Feb 2017 07:42:19 +0000 (+0100)
Subject: message log parser util: ignore patterns after message is completed
X-Git-Tag: collectd-5.11.0~18^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55005f93f636d67150164ab1f4a019cd33399f62;p=thirdparty%2Fcollectd.git

message log parser util: ignore patterns after message is completed

Extend condition to ignore patterns before message has started
and after it is completed.

Change-Id: I2ea7fcc8c11bf3f41a21aa08b014faf6074d2234
Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
---

diff --git a/src/utils_message_parser.c b/src/utils_message_parser.c
index 29c64d688..cdffae49d 100644
--- a/src/utils_message_parser.c
+++ b/src/utils_message_parser.c
@@ -174,9 +174,11 @@ static int message_assembler(const char *row, char *const *matches,
     if (parser_job->start_message_assembly(parser_job) != 0)
       return -1;
   }
-  /* Ignoring message items without corresponding start item */
+  /* Ignoring message items without corresponding start item or
+   * after completion */
   if (parser_job->message_idx < 0 ||
-      parser_job->messages_storage[parser_job->message_idx].started == 0) {
+      parser_job->messages_storage[parser_job->message_idx].started == 0 ||
+      parser_job->messages_storage[parser_job->message_idx].completed == 1) {
     DEBUG(UTIL_NAME ": Dropping item with no corresponding start element");
     return 0;
   }