projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7' into collectd-5.8
[collectd.git]
/
src
/
log_logstash.c
diff --git
a/src/log_logstash.c
b/src/log_logstash.c
index
8df4313
..
8ff9045
100644
(file)
--- a/
src/log_logstash.c
+++ b/
src/log_logstash.c
@@
-183,22
+183,14
@@
err:
static void log_logstash_log(int severity, const char *msg,
user_data_t __attribute__((unused)) * user_data) {
static void log_logstash_log(int severity, const char *msg,
user_data_t __attribute__((unused)) * user_data) {
- yajl_gen g;
-#if !defined(HAVE_YAJL_V2)
- yajl_gen_config conf = {};
-
- conf.beautify = 0;
-#endif
-
if (severity > log_level)
return;
#if HAVE_YAJL_V2
if (severity > log_level)
return;
#if HAVE_YAJL_V2
- g = yajl_gen_alloc(NULL);
+
yajl_gen
g = yajl_gen_alloc(NULL);
#else
#else
-
g = yajl_gen_alloc(&conf
, NULL);
+
yajl_gen g = yajl_gen_alloc(&(yajl_gen_config){0}
, NULL);
#endif
#endif
-
if (g == NULL) {
fprintf(stderr, "Could not allocate JSON generator.\n");
return;
if (g == NULL) {
fprintf(stderr, "Could not allocate JSON generator.\n");
return;
@@
-236,7
+228,7
@@
static int log_logstash_notification(const notification_t *n,
if (g == NULL) {
fprintf(stderr, "Could not allocate JSON generator.\n");
if (g == NULL) {
fprintf(stderr, "Could not allocate JSON generator.\n");
- return
(0)
;
+ return
0
;
}
if (yajl_gen_map_open(g) != yajl_gen_status_ok)
}
if (yajl_gen_map_open(g) != yajl_gen_status_ok)
@@
-323,12
+315,12
@@
static int log_logstash_notification(const notification_t *n,
}
log_logstash_print(g, LOG_INFO, (n->time != 0) ? n->time : cdtime());
}
log_logstash_print(g, LOG_INFO, (n->time != 0) ? n->time : cdtime());
- return
(0)
;
+ return
0
;
err:
yajl_gen_free(g);
fprintf(stderr, "Could not correctly generate JSON notification\n");
err:
yajl_gen_free(g);
fprintf(stderr, "Could not correctly generate JSON notification\n");
- return
(0)
;
+ return
0
;
} /* int log_logstash_notification */
void module_register(void) {
} /* int log_logstash_notification */
void module_register(void) {
@@
-339,5
+331,3
@@
void module_register(void) {
plugin_register_notification("log_logstash", log_logstash_notification,
/* user_data = */ NULL);
} /* void module_register (void) */
plugin_register_notification("log_logstash", log_logstash_notification,
/* user_data = */ NULL);
} /* void module_register (void) */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */