]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
message log parser util: ignore patterns after message is completed
authorKamil Wiatrowski <kamilx.wiatrowski@intel.com>
Tue, 7 Feb 2017 07:42:19 +0000 (08:42 +0100)
committerKamil Wiatrowski <kamilx.wiatrowski@intel.com>
Fri, 22 Nov 2019 12:31:07 +0000 (13:31 +0100)
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>
src/utils_message_parser.c

index 29c64d688c4c682dd9a48f53956e1e2445132551..cdffae49db180fccca5b81fcd9a543a521f70144 100644 (file)
@@ -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;
   }