Rules are now completly loaded.

Next step is to setup the spy library to put a watch on each log file
matching the globs from rules.

7 files changed, 126 insertions, 16 deletions

diff --git a/src/bin/filter.c b/src/bin/filter.c
index 83d51ac..ef05a49 100644
--- a/src/bin/filter.c
+++ b/src/bin/filter.c
@@ -12,6 +12,12 @@ filter_load(void *data,
      return;
 
    DBG("smman[%p] rules[%p] rule[%p][%s]", smman, rules, rule, rule->name);
+
+   DBG("rule : %s\n\tfilename[%s]\n\tsource_host[%s]\n\t"
+       "source_path[%s]\n\ttags[%s]\n\ttodel[%s]",
+       rule->name, rule->spec.filename, rule->spec.source_host,
+       rule->spec.source_path, rule->spec.tags,
+       (rule->spec.todel) ? "EINA_TRUE" : "EINA_FALSE");
 }
 
 void
diff --git a/src/include/Conf.h b/src/include/Conf.h
index e6f68fe..6a007b4 100644
--- a/src/include/Conf.h
+++ b/src/include/Conf.h
@@ -9,6 +9,7 @@ typedef struct _Conf Conf;
 typedef void (*Conf_Done_Cb)(void *data, Conf *conf);
 typedef void (*Conf_Error_Cb)(void *data, Conf *conf, const char *errstr);
 
+const char * conf_file_get(Conf *conf);
 Eina_Hash * conf_variables_get(Conf *conf);
 Eina_Bool conf_load(char *file, Conf_Done_Cb done_cb, Conf_Error_Cb error_cb, const void *data);
 int conf_init(void);
diff --git a/src/include/Rules.h b/src/include/Rules.h
index 0c6fad9..e20e2a5 100644
--- a/src/include/Rules.h
+++ b/src/include/Rules.h
@@ -19,7 +19,6 @@ struct _Rule
    struct
    {
       const char *filename,
-                 *type,
                  *source_host,
                  *source_path,
                  *tags;
diff --git a/src/lib/conf/conf_main.c b/src/lib/conf/conf_main.c
index 5de7438..c28e886 100644
--- a/src/lib/conf/conf_main.c
+++ b/src/lib/conf/conf_main.c
@@ -3,9 +3,17 @@
 static int _conf_init_count = 0;
 int _conf_log_dom_global = -1;
 
+const char *
+conf_file_get(Conf *conf)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conf, NULL);
+   return conf->file;
+}
+
 Eina_Hash *
 conf_variables_get(Conf *conf)
 {
+   EINA_SAFETY_ON_NULL_RETURN_VAL(conf, NULL);
    return conf->variables;
 }
 
diff --git a/src/lib/rules/rules_load.c b/src/lib/rules/rules_load.c
index 58daf1f..47ae3bf 100644
--- a/src/lib/rules/rules_load.c
+++ b/src/lib/rules/rules_load.c
@@ -1,5 +1,88 @@
 #include "rules_private.h"
 
+void
+rules_load_rule(void *data,
+                Conf *conf)
+{
+   Rules_Load *rl;
+   Rule *rule;
+   Eina_Iterator *it;
+   const char *file,
+              *s;
+
+   rl = data;
+   file = conf_file_get(conf);
+
+   DBG("Loaded rule %s", file);
+
+   s = strrchr(file, '/');
+   if (!s) s = file;
+   else s += 1;
+
+   rule = calloc(1, sizeof(Rule));
+   rule->name = strdup(s);
+
+   it =  eina_hash_iterator_tuple_new(conf_variables_get(conf));
+   while (eina_iterator_next(it, &data))
+     {
+        const char *variable,
+                   *value;
+        Eina_Hash_Tuple *t = data;
+
+        variable = t->key;
+        value = t->data;
+        if (!strcmp(variable, "filename"))
+          rule->spec.filename = strdup(value);
+        else if (!strcmp(variable, "tags"))
+          rule->spec.tags = strdup(value);
+        else if (!strcmp(variable, "source_host"))
+          rule->spec.source_host = strdup(value);
+        else if (!strcmp(variable, "source_path"))
+          rule->spec.source_path = strdup(value);
+        else if (!strcmp(variable, "todel"))
+          rule->spec.todel = !!atoi(value);
+
+        else if (!strncmp(variable, "message", 7))
+        {
+           Rule_Regex *rr;
+           int r;
+
+           rr = calloc(1, sizeof(Rule_Regex));
+           rule->spec.regex = eina_inlist_append(rule->spec.regex,
+                                                 EINA_INLIST_GET(rr));
+
+           r = regcomp(&(rr->preg), value, REG_EXTENDED);
+           if (r)
+             {
+                ERR("Failed to compile regex \"%s\", dropping rule.", value);
+                eina_iterator_free(it);
+                rules_rule_free(rule);
+                return;
+             }
+           rr->regex = strdup(value);
+
+           if (!strstr(variable + 7, "unmatch"))
+             rr->must_match = EINA_TRUE;
+        }
+     }
+   eina_iterator_free(it);
+   rl->cb.progress((void *)rl->cb.data, rl->rules, rule);
+}
+
+void
+rules_load_rule_error(void *data,
+                      Conf *conf,
+                      const char *errstr)
+{
+   Rules_Load *rl;
+
+   rl = data;
+
+   DBG("Failed to load rule %s", conf_file_get(conf));
+   rl->cb.error((void *)rl->cb.data, rl->rules, errstr);
+   free(rl);
+}
+
 Eina_Bool
 rules_load_ls_filter(void *data EINA_UNUSED,
                      Eio_File *handler EINA_UNUSED,
@@ -16,31 +99,22 @@ rules_load_ls(void *data,
               const Eina_File_Direct_Info *info)
 {
    Rules_Load *rl;
-   Rule *rule;
-
-   DBG("Rule file : %s", info->path + info->name_start);
 
    rl = data;
+   DBG("rl[%p] Rule file : %s", rl, info->path + info->name_start);
 
    /* We load file */
-
-   /* If file is OK, we register it */
-   rule = calloc(1, sizeof(Rule));
-   rule->name = strdup(info->path + info->name_start);
-
-   rl->cb.progress((void *)rl->cb.data, rl->rules, rule);
+   conf_load((char *)info->path,
+             rules_load_rule,
+             rules_load_rule_error,
+             rl);
 }
 
 void
-rules_load_ls_done(void *data,
+rules_load_ls_done(void *data EINA_UNUSED,
                    Eio_File *handler EINA_UNUSED)
 {
-   Rules_Load *rl;
-
    DBG("End of rules listing.");
-   rl = data;
-   rl->cb.done((void *)rl->cb.data, rl->rules);
-   free(rl);
 }
 
 
diff --git a/src/lib/rules/rules_main.c b/src/lib/rules/rules_main.c
index 3ea4746..e1f73a8 100644
--- a/src/lib/rules/rules_main.c
+++ b/src/lib/rules/rules_main.c
@@ -3,6 +3,26 @@
 static int _rules_init_count = 0;
 int _rules_log_dom_global = -1;
 
+
+void
+rules_rule_free(Rule *rule)
+{
+   Rule_Regex *rr;
+   EINA_SAFETY_ON_NULL_RETURN(rule);
+
+   free((char *)rule->name);
+   free((char *)rule->spec.filename);
+   free((char *)rule->spec.source_host);
+   free((char *)rule->spec.source_path);
+   free((char *)rule->spec.tags);
+
+   EINA_INLIST_FOREACH(rule->spec.regex, rr)
+     {
+        free((char *)rr->regex);
+        free(rr);
+     }
+}
+
 Rules *
 rules_new(const char *directory)
 {
diff --git a/src/lib/rules/rules_private.h b/src/lib/rules/rules_private.h
index 1d74d95..f20293e 100644
--- a/src/lib/rules/rules_private.h
+++ b/src/lib/rules/rules_private.h
@@ -27,6 +27,8 @@ typedef struct _Rules_Load
    } cb;
 } Rules_Load;
 
+void rules_rule_free(Rule *rule);
+
 Eina_Bool rules_load_ls_filter(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
 void rules_load_ls(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
 void rules_load_ls_done(void *data, Eio_File *handler);