bindings/java/Makefile.am: Add "uninstall-local" target.

[collectd.git] / src / log_logstash.c

diff --git a/src/log_logstash.c b/src/log_logstash.c
index b940046..61e7f48 100644 (file)
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -1,19 +1,24 @@
 /**
  * collectd - src/log_logstash.c
- * Copyright (C) 2013 Pierre-Yves Ritschard
+ * Copyright (C) 2013       Pierre-Yves Ritschard
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Pierre-Yves Ritschard <pyr at spootnik.org>
@@ -36,7 +41,7 @@
 # define HAVE_YAJL_V2 1
 #endif
 
-#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.json.log"
+#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/"PACKAGE_NAME".json.log"
 
 #if COLLECT_DEBUG
 static int log_level = LOG_DEBUG;
@@ -60,7 +65,6 @@ static int log_logstash_config (const char *key, const char *value)
 
        if (0 == strcasecmp (key, "LogLevel")) {
                log_level = parse_log_severity(value);
-               printf("parsed log level: %d\n", log_level);
         if (log_level < 0) {
             log_level = LOG_INFO;
             ERROR("log_logstash: invalid loglevel [%s] defaulting to 'info'",
@@ -93,7 +97,7 @@ static void log_logstash_print (yajl_gen g, int severity,
        unsigned int len;
 #endif
 
-       if (yajl_gen_string(g, (u_char *)"@level", strlen("@level")) !=
+       if (yajl_gen_string(g, (u_char *)"level", strlen("level")) !=
            yajl_gen_status_ok)
                goto err;
 
@@ -225,7 +229,7 @@ static void log_logstash_log (int severity, const char *msg,
 
        if (yajl_gen_map_open(g) != yajl_gen_status_ok)
                goto err;
-       if (yajl_gen_string(g, (u_char *)"@message", strlen("@message")) !=
+       if (yajl_gen_string(g, (u_char *)"message", strlen("message")) !=
            yajl_gen_status_ok)
                goto err;
        if (yajl_gen_string(g, (u_char *)msg, strlen(msg)) !=
@@ -261,7 +265,7 @@ static int log_logstash_notification (const notification_t *n,
 
        if (yajl_gen_map_open(g) != yajl_gen_status_ok)
                goto err;
-       if (yajl_gen_string(g, (u_char *)"@message", strlen("@message")) !=
+       if (yajl_gen_string(g, (u_char *)"message", strlen("message")) !=
            yajl_gen_status_ok)
                goto err;
        if (strlen(n->message) > 0) {
@@ -276,14 +280,6 @@ static int log_logstash_notification (const notification_t *n,
                        goto err;
        }
 
-
-       if (yajl_gen_string(g, (u_char *)"@fields", strlen("@fields")) !=
-           yajl_gen_status_ok)
-               goto err;
-       if (yajl_gen_map_open(g) !=
-           yajl_gen_status_ok)
-               goto err;
-
        if (strlen(n->host) > 0) {
                if (yajl_gen_string(g, (u_char *)"host", strlen("host")) !=
                    yajl_gen_status_ok)
@@ -361,8 +357,6 @@ static int log_logstash_notification (const notification_t *n,
                        goto err;
                break;
        }
-       if (yajl_gen_map_close(g) != yajl_gen_status_ok)
-               goto err;
 
        log_logstash_print (g, LOG_INFO, (n->time != 0) ? n->time : cdtime ());
        return (0);