Smman can now insert logs into ES.

4 files changed, 39 insertions, 19 deletions

diff --git a/src/bin/config.c b/src/bin/config.c
index 4c29e34..192feb0 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -6,6 +6,7 @@ config_done(void *data,
 {
    Smman *smman;
    Eina_Iterator *it;
+   char *s;
 
    smman = data;
 
@@ -29,7 +30,13 @@ config_done(void *data,
    DBG("Host = %s", smman->cfg.host);
    eina_iterator_free(it);
 
-   smman->store = store_new(smman->cfg.server);
+   s = sdupf("%s%s%s",
+             smman->cfg.server,
+             (smman->cfg.server[strlen(smman->cfg.server)-1] == '/') ?
+                "" : "/",
+             "logs/");
+   smman->store = store_new(s);
+   free(s);
 }
 
 void
diff --git a/src/bin/log.c b/src/bin/log.c
index 0ecfe4c..87c1af4 100644
--- a/src/bin/log.c
+++ b/src/bin/log.c
@@ -11,6 +11,27 @@ typedef struct _Log
 } Log;
 
 void
+_log_done(void *data,
+          Store *store EINA_UNUSED,
+          char *answer,
+          size_t len)
+{
+   Smman *smman = data;
+
+   DBG("smman[%p] Having a %zd bytes answer : \n%s\n", smman, len, answer);
+}
+
+void
+_log_error(void *data,
+           Store *store EINA_UNUSED,
+           char *strerr)
+{
+   Smman *smman = data;
+
+   ERR("smman[%p] Failed to store data :\n%s\n", smman, strerr);
+}
+
+void
 _log_send(Smman *smman,
           Log *log)
 {
@@ -18,7 +39,8 @@ _log_send(Smman *smman,
          *json_tags;
    char *source,
         *date,
-        *tag;
+        *tag,
+        *s;
    Eina_List *l;
 
    json = cJSON_CreateObject();
@@ -53,10 +75,13 @@ _log_send(Smman *smman,
    cJSON_AddStringToObject(json, "@source_host", log->source_host);
    cJSON_AddStringToObject(json, "@source_path", log->source_path);
 
+   s = cJSON_Print(json);
 
+   store_add(smman->store, s, strlen(s), _log_done, _log_error, smman);
+
+   free(s);
    free(date);
    free(source);
-   DBG("JSON = \n%s", cJSON_Print(json));
    cJSON_Delete(json);
 }
 
@@ -90,7 +115,6 @@ _log_line_match(const char *log, Rule *rule)
         r = regexec(&(rr->preg), log, nmatch, pmatch, 0);
         if (r == rr->must_match)
           {
-             NFO("Log \"%s\" is not affected by rule %s", log, rule->name);
              excluded = EINA_TRUE;
              break;
           }
@@ -127,12 +151,9 @@ log_line_event(void *data,
    it = eina_hash_iterator_tuple_new(filter->rules);
    while (eina_iterator_next(it, (void **)&t))
      {
-        const char *name;
         Eina_List *l;
 
-        name = t->key;
         rule = t->data;
-        DBG("rule[%p][%s]", rule, name);
 
         r = _log_line_match(spy_line_get(sl), rule);
         if (!r)
@@ -158,17 +179,6 @@ log_line_event(void *data,
    if (log->todel)
      return EINA_TRUE;
 
-
-   DBG("Log to index :\n"
-       "\tmessage = %s\n"
-       "\tfilename = %s\n"
-       "\tsource_host = %s\n"
-       "\tsource_path = %s",
-       log->message,
-       log->filename,
-       log->source_host,
-       log->source_path);
-
    _log_send(smman, log);
 
    _log_free(log);
diff --git a/src/bin/main.c b/src/bin/main.c
index 6f85a98..9a73992 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -112,6 +112,7 @@ int main(int argc, char **argv)
    conf_init();
    rules_init();
    spy_init();
+   store_init();
 
    smman = init();
    if (!smman)
@@ -123,6 +124,8 @@ int main(int argc, char **argv)
 
    ecore_main_loop_begin();
 
+   store_shutdown();
+   spy_shutdown();
    rules_shutdown();
    conf_shutdown();
    ecore_shutdown();
diff --git a/src/lib/store/store_event.c b/src/lib/store/store_event.c
index 4f23c7d..73533f4 100644
--- a/src/lib/store/store_event.c
+++ b/src/lib/store/store_event.c
@@ -38,7 +38,7 @@ store_event_complete(void *data,
      return EINA_TRUE;
 
    http_code = ecore_con_url_status_code_get(sa->ec);
-   if (http_code != 200)
+   if ((http_code != 200) && (http_code != 201))
      {
         errstr = store_utils_dupf("Server replied HTTP code %i", http_code);
         sa->cb.error((void *)sa->cb.data, sa->store, errstr);