From 07cc7a742bb837632280b3cbf5be495ea3a38457 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 15 Mar 2021 17:20:39 +0100 Subject: [PATCH] tab --- sink/sink20169.c | 60 +++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/sink/sink20169.c b/sink/sink20169.c index b6db22c..0331752 100644 --- a/sink/sink20169.c +++ b/sink/sink20169.c @@ -238,13 +238,11 @@ int initForwarder(t_configHandle *configHandle, t_forwarderHandle *handle) { } logmsg(LOG_INFO, "influxUrl is %s", handle->influxUrl); - uint32_t lowerBound = 45000; - config_lookup_int(&(configHandle->cfg), "lowerBound", &lowerBound); - handle->lowerBound = lowerBound; - uint32_t upperBound = 55000; - config_lookup_int(&(configHandle->cfg), "upperBound", &upperBound); - handle->upperBound = upperBound; - logmsg(LOG_INFO, "lowerBound: %u, upperBound: %u", lowerBound, upperBound); + handle->lowerBound = 45000; + config_lookup_int(&(configHandle->cfg), "lowerBound", &(handle->lowerBound)); + handle->upperBound = 55000; + config_lookup_int(&(configHandle->cfg), "upperBound", &(handle->upperBound)); + logmsg(LOG_INFO, "lowerBound: %u, upperBound: %u", handle->lowerBound, handle->upperBound); return 0; } @@ -292,32 +290,32 @@ int forwardMinuteBuffer(t_forwarderHandle *handle, t_minuteBuffer *buf) { logmsg(LOG_DEBUG, "Time: %lu, Frequency: %u", timestamp, buf->s.frequency[j]); if ((buf->s.frequency[j] >= handle->lowerBound) && (buf->s.frequency[j] <= handle->upperBound)) { - int frequency_before_point = buf->s.frequency[j] / 1000; - int frequency_behind_point = buf->s.frequency[j] - (frequency_before_point * 1000); + int frequency_before_point = buf->s.frequency[j] / 1000; + int frequency_behind_point = buf->s.frequency[j] - (frequency_before_point * 1000); - char payload[256]; - int res = snprintf(payload, sizeof(payload), - "%s,valid=1,location=%s,host=%s freq=%d.%03d" - #ifdef OpenBSD - " %llu" - #else - " %lu" - #endif - "", - handle->influxMeasurement, location, buf->s.deviceId, - frequency_before_point, frequency_behind_point, - timestamp); - if (res > sizeof(payload)) { - logmsg(LOG_ERR, "payload buffer to small"); - return -1; - } - logmsg(LOG_DEBUG, "Payload: %s", payload); - res = httpPostRequest(handle->influxUrl, handle->influxUser, handle->influxPass, payload); - if (res == 0) { - logmsg(LOG_DEBUG, "Successfully sent to InfluxDB"); - } + char payload[256]; + int res = snprintf(payload, sizeof(payload), + "%s,valid=1,location=%s,host=%s freq=%d.%03d" +#ifdef OpenBSD + " %llu" +#else + " %lu" +#endif + "", + handle->influxMeasurement, location, buf->s.deviceId, + frequency_before_point, frequency_behind_point, + timestamp); + if (res > sizeof(payload)) { + logmsg(LOG_ERR, "payload buffer to small"); + return -1; + } + logmsg(LOG_DEBUG, "Payload: %s", payload); + res = httpPostRequest(handle->influxUrl, handle->influxUser, handle->influxPass, payload); + if (res == 0) { + logmsg(LOG_DEBUG, "Successfully sent to InfluxDB"); + } } else { - logmsg(LOG_ERR, "%u out of bound", buf->s.frequency[j]); + logmsg(LOG_ERR, "%u out of bound, ignored", buf->s.frequency[j]); } }