X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flog_logstash.c;h=24083a5081e1445d78d61002f3b111fdd0c14020;hb=c5ffa797883f238776e6294054f260df3cd0aea6;hp=61e7f4848e3a4b6dd24f87cf5ac3fb630416e7fd;hpb=09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b;p=collectd.git

diff --git a/src/log_logstash.c b/src/log_logstash.c
index 61e7f484..24083a50 100644
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -27,11 +27,11 @@
  **/
 
 #include "collectd.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
@@ -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 (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);
@@ -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;
-	time_t tt;
 #if HAVE_YAJL_V2
 	size_t len;
 #else
@@ -140,14 +139,13 @@ static void log_logstash_print (yajl_gen g, int severity,
 	    yajl_gen_status_ok)
 		goto err;
 
-	tt = CDTIME_T_TO_TIME_T (timestamp_time);
-	gmtime_r (&tt, &timestamp_tm);
+	gmtime_r (&CDTIME_T_TO_TIME_T (timestamp_time), &timestamp_tm);
 
 	/*
 	 * format time as a UTC ISO 8601 compliant string
 	 */
 	strftime (timestamp_str, sizeof (timestamp_str),
-		  "%Y-%m-%d %H:%M:%SZ", &timestamp_tm);
+		  "%Y-%m-%dT%H:%M:%SZ", &timestamp_tm);
 	timestamp_str[sizeof (timestamp_str) - 1] = '\0';
 
 	if (yajl_gen_string(g, (u_char *)timestamp_str,
@@ -208,7 +206,7 @@ static void log_logstash_log (int severity, const char *msg,
 {
 	yajl_gen g;
 #if !defined(HAVE_YAJL_V2)
-	yajl_gen_config conf;
+	yajl_gen_config conf = {};
 
 	conf.beautify = 0;
 #endif
@@ -252,7 +250,7 @@ static int log_logstash_notification (const notification_t *n,
 #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);