src/filter_chain.c: Implement the default behavior.

[collectd.git] / src / filter_chain.c

diff --git a/src/filter_chain.c b/src/filter_chain.c
index 9a15661..b73d6e1 100644 (file)
--- a/src/filter_chain.c
+++ b/src/filter_chain.c
@@ -340,17 +340,23 @@ static int fc_config_add_target (fc_target_t **targets_head, /* {{{ */
 
   sstrncpy (t->name, ptr->name, sizeof (t->name));
   memcpy (&t->proc, &ptr->proc, sizeof (t->proc));
-  assert (t->proc.create != NULL);
   t->user_data = NULL;
   t->next = NULL;
 
-  status = (*t->proc.create) (ci, &t->user_data);
-  if (status != 0)
+  if (t->proc.create != NULL)
   {
-    WARNING ("Filter subsystem: Failed to create a %s match.",
-        t->name);
-    fc_free_targets (t);
-    return (-1);
+    status = (*t->proc.create) (ci, &t->user_data);
+    if (status != 0)
+    {
+      WARNING ("Filter subsystem: Failed to create a %s match.",
+          t->name);
+      fc_free_targets (t);
+      return (-1);
+    }
+  }
+  else
+  {
+    t->user_data = NULL;
   }
   
   if (*targets_head != NULL)
@@ -497,6 +503,8 @@ static int fc_config_add_chain (const oconfig_item_t *ci) /* {{{ */
 
     if (strcasecmp ("Rule", option->key) == 0)
       status = fc_config_add_rule (chain, option);
+    else if (strcasecmp ("Target", option->key) == 0)
+      status = fc_config_add_target (&chain->targets, option);
     else
     {
       WARNING ("Filter subsystem: Chain %s: Option `%s' not allowed "
@@ -557,12 +565,19 @@ int fc_process_chain (const data_set_t *ds, value_list_t *vl, /* {{{ */
   if (chain == NULL)
     return (-1);
 
+  DEBUG ("fc_process_chain (chain = %s);", chain->name);
+
   status = FC_ACTION_CONTINUE;
 
   for (rule = chain->rules; rule != NULL; rule = rule->next)
   {
     fc_match_t *match;
 
+    if (rule->name[0] != 0)
+    {
+      DEBUG ("fc_process_chain: Testing the `%s' rule.", rule->name);
+    }
+
     /* N. B.: rule->matches may be NULL. */
     for (match = rule->matches; match != NULL; match = match->next)
     {
@@ -570,7 +585,7 @@ int fc_process_chain (const data_set_t *ds, value_list_t *vl, /* {{{ */
           &match->user_data);
       if (status < 0)
       {
-        WARNING ("fc_process: A match failed.");
+        WARNING ("fc_process_chain: A match failed.");
         break;
       }
       else if (status != FC_MATCH_MATCHES)
@@ -581,14 +596,20 @@ int fc_process_chain (const data_set_t *ds, value_list_t *vl, /* {{{ */
     if (match != NULL)
       continue;
 
+    if (rule->name[0] != 0)
+    {
+      DEBUG ("fc_process_chain: Rule `%s' matches.", rule->name);
+    }
+
     for (target = rule->targets; target != NULL; target = target->next)
     {
-      /* If we get here, all matches have matched the value. Execute the target. */
+      /* If we get here, all matches have matched the value. Execute the
+       * target. */
       status = (*target->proc.invoke) (ds, vl, /* meta = */ NULL,
           &target->user_data);
       if (status < 0)
       {
-        WARNING ("fc_process: A target failed.");
+        WARNING ("fc_process_chain: A target failed.");
         continue;
       }
       else if (status == FC_ACTION_CONTINUE)
@@ -597,12 +618,19 @@ int fc_process_chain (const data_set_t *ds, value_list_t *vl, /* {{{ */
         break;
       else
       {
-        WARNING ("fc_process: Unknown target return value: %i", status);
+        WARNING ("fc_process_chain: Unknown target return value: %i", status);
       }
     }
 
     if (status == FC_ACTION_STOP)
+    {
+      if (rule->name[0] != 0)
+      {
+        DEBUG ("fc_process_chain: Rule `%s' signaled the stop condition.",
+            rule->name);
+      }
       break;
+    }
   } /* for (rule) */
 
   /* for-loop has been aborted: A target returned `FC_ACTION_STOP' */
@@ -611,12 +639,13 @@ int fc_process_chain (const data_set_t *ds, value_list_t *vl, /* {{{ */
 
   for (target = chain->targets; target != NULL; target = target->next)
   {
-    /* If we get here, all matches have matched the value. Execute the target. */
+    /* If we get here, all matches have matched the value. Execute the
+     * target. */
     status = (*target->proc.invoke) (ds, vl, /* meta = */ NULL,
         &target->user_data);
     if (status < 0)
     {
-      WARNING ("fc_process: The default target failed.");
+      WARNING ("fc_process_chain: The default target failed.");
     }
   }
 
@@ -862,6 +891,8 @@ int fc_register_match (const char *name, match_proc_t proc) /* {{{ */
 {
   fc_match_t *m;
 
+  DEBUG ("fc_register_match (%s);", name);
+
   m = (fc_match_t *) malloc (sizeof (*m));
   if (m == NULL)
     return (-ENOMEM);
@@ -894,6 +925,8 @@ int fc_register_target (const char *name, target_proc_t proc) /* {{{ */
 {
   fc_target_t *t;
 
+  DEBUG ("fc_register_target (%s);", name);
+
   t = (fc_target_t *) malloc (sizeof (*t));
   if (t == NULL)
     return (-ENOMEM);
@@ -934,9 +967,8 @@ int fc_process (const data_set_t *ds, value_list_t *vl) /* {{{ */
   if (chain != NULL)
     return (fc_process_chain (ds, vl, chain));
 
-  ERROR ("fc_process: TODO: Implement default behavior!");
-
-  return (0);
+  return (fc_bit_write_invoke (ds, vl,
+        /* meta = */ NULL, /* user_data = */ NULL));
 } /* }}} int fc_process */
 
 int fc_configure (const oconfig_item_t *ci) /* {{{ */