diff --git a/src/log_logstash.c b/src/log_logstash.c
index 14e157b52fd04754897cde2cf607fa6cbf0d0e06..2883e6c97d2872ac8e4e396cdedbe849e4effce5 100644 (file)
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
/**
* 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>
# 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;
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;
{
yajl_gen g;
#if !defined(HAVE_YAJL_V2)
- yajl_gen_config conf;
+ yajl_gen_config conf = {};
conf.beautify = 0;
#endif
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)) !=
#if HAVE_YAJL_V2
g = yajl_gen_alloc(NULL);
#else
- yajl_gen_config conf;
+ yajl_gen_config conf = {};
conf.beautify = 0;
g = yajl_gen_alloc(&conf, NULL);
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) {
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)
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);