projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/docker: add LD_PRELOAD wrapper to fopen/open/opendir syscalls
[collectd.git]
/
src
/
log_logstash.c
diff --git
a/src/log_logstash.c
b/src/log_logstash.c
index
2d5f620
..
24083a5
100644
(file)
--- a/
src/log_logstash.c
+++ b/
src/log_logstash.c
@@
-27,11
+27,11
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include <sys/types.h>
#include "common.h"
#include "plugin.h"
#include <sys/types.h>
-#include <pthread.h>
#include <yajl/yajl_common.h>
#include <yajl/yajl_gen.h>
#if HAVE_YAJL_YAJL_VERSION_H
#include <yajl/yajl_common.h>
#include <yajl/yajl_gen.h>
#if HAVE_YAJL_YAJL_VERSION_H
@@
-65,12
+65,12
@@
static int log_logstash_config (const char *key, const char *value)
if (0 == strcasecmp (key, "LogLevel")) {
log_level = parse_log_severity(value);
if (0 == strcasecmp (key, "LogLevel")) {
log_level = parse_log_severity(value);
- if (log_level < 0) {
- log_level = LOG_INFO;
- ERROR("log_logstash: invalid loglevel [%s] defaulting to 'info'",
- value);
- return 1;
- }
+
if (log_level < 0) {
+
log_level = LOG_INFO;
+
ERROR("log_logstash: invalid loglevel [%s] defaulting to 'info'",
+
value);
+
return 1;
+
}
}
else if (0 == strcasecmp (key, "File")) {
sfree (log_file);
}
else if (0 == strcasecmp (key, "File")) {
sfree (log_file);
@@
-90,7
+90,6
@@
static void log_logstash_print (yajl_gen g, int severity,
struct tm timestamp_tm;
char timestamp_str[64];
const unsigned char *buf;
struct tm timestamp_tm;
char timestamp_str[64];
const unsigned char *buf;
- time_t tt;
#if HAVE_YAJL_V2
size_t len;
#else
#if HAVE_YAJL_V2
size_t len;
#else
@@
-140,8
+139,7
@@
static void log_logstash_print (yajl_gen g, int severity,
yajl_gen_status_ok)
goto err;
yajl_gen_status_ok)
goto err;
- tt = CDTIME_T_TO_TIME_T (timestamp_time);
- gmtime_r (&tt, ×tamp_tm);
+ gmtime_r (&CDTIME_T_TO_TIME_T (timestamp_time), ×tamp_tm);
/*
* format time as a UTC ISO 8601 compliant string
/*
* format time as a UTC ISO 8601 compliant string