X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Flog_logstash.c;h=28cc34c83fb17b9fc907039507033503ace055f4;hp=3ef7139702a270ce9c8e3f1d6139625012c60f99;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=a2ddc387687433291c36e7bc8a2f3a5ea88fd0a9 diff --git a/src/log_logstash.c b/src/log_logstash.c index 3ef71397..28cc34c8 100644 --- a/src/log_logstash.c +++ b/src/log_logstash.c @@ -79,7 +79,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 @@ -127,8 +126,7 @@ 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, ×tamp_tm); + gmtime_r(&CDTIME_T_TO_TIME_T(timestamp_time), ×tamp_tm); /* * format time as a UTC ISO 8601 compliant string @@ -238,7 +236,7 @@ static int log_logstash_notification(const notification_t *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) @@ -325,12 +323,12 @@ static int log_logstash_notification(const notification_t *n, } 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"); - return (0); + return 0; } /* int log_logstash_notification */ void module_register(void) { @@ -341,5 +339,3 @@ 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 : */