projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel_rdt: Added check if name group is defined before updating of pids list
[collectd.git]
/
src
/
log_logstash.c
diff --git
a/src/log_logstash.c
b/src/log_logstash.c
index
8f3063f
..
b04aadd
100644
(file)
--- a/
src/log_logstash.c
+++ b/
src/log_logstash.c
@@
-28,8
+28,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <sys/types.h>
#include <yajl/yajl_common.h>
#include <sys/types.h>
#include <yajl/yajl_common.h>
@@
-182,22
+182,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;