From: Florian Forster <octo@collectd.org>
Date: Tue, 8 Dec 2015 13:39:07 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~20
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d89829d22853ee0b7678b6e2ee7fdd359f3b7202;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

d89829d22853ee0b7678b6e2ee7fdd359f3b7202
diff --cc src/tail.c
index 3904f1be,72d97a38..708cd2a3
--- a/src/tail.c
+++ b/src/tail.c
@@@ -243,17 -230,13 +243,17 @@@ static int ctail_config_add_file (oconf
    for (i = 0; i < ci->children_num; i++)
    {
      oconfig_item_t *option = ci->children + i;
 -    int status;
 +    int status = 0;
  
 -    if (strcasecmp ("Match", option->key) == 0)
 +    if (strcasecmp ("Instance", option->key) == 0)
 +      status = cf_util_get_string (option, &plugin_instance);
 +    else if (strcasecmp ("Interval", option->key) == 0)
 +      cf_util_get_cdtime (option, &interval);
 +    else if (strcasecmp ("Match", option->key) == 0)
      {
 -      status = ctail_config_add_match (tm, plugin_instance, option);
 +      status = ctail_config_add_match (tm, plugin_instance, option, interval);
        if (status == 0)
- 	num_matches++;
+         num_matches++;
        /* Be mild with failed matches.. */
        status = 0;
      }