mainscnt/sinkserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tab

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2021-03-15 17:20:39 +01:00
parent cface0d4b2
commit 07cc7a742b
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
sink/sink20169.c
View File

@ -238,13 +238,11 @@ int initForwarder(t_configHandle *configHandle, t_forwarderHandle *handle) {
} }
logmsg(LOG_INFO, "influxUrl is %s", handle->influxUrl); logmsg(LOG_INFO, "influxUrl is %s", handle->influxUrl);
uint32_t lowerBound = 45000; handle->lowerBound = 45000;
config_lookup_int(&(configHandle->cfg), "lowerBound", &lowerBound); config_lookup_int(&(configHandle->cfg), "lowerBound", &(handle->lowerBound));
handle->lowerBound = lowerBound; handle->upperBound = 55000;
uint32_t upperBound = 55000; config_lookup_int(&(configHandle->cfg), "upperBound", &(handle->upperBound));
config_lookup_int(&(configHandle->cfg), "upperBound", &upperBound); logmsg(LOG_INFO, "lowerBound: %u, upperBound: %u", handle->lowerBound, handle->upperBound);
handle->upperBound = upperBound;
logmsg(LOG_INFO, "lowerBound: %u, upperBound: %u", lowerBound, upperBound);
return 0; 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]); 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)) { if ((buf->s.frequency[j] >= handle->lowerBound) && (buf->s.frequency[j] <= handle->upperBound)) {
int frequency_before_point = buf->s.frequency[j] / 1000; int frequency_before_point = buf->s.frequency[j] / 1000;
int frequency_behind_point = buf->s.frequency[j] - (frequency_before_point * 1000); int frequency_behind_point = buf->s.frequency[j] - (frequency_before_point * 1000);
char payload[256]; char payload[256];
int res = snprintf(payload, sizeof(payload), int res = snprintf(payload, sizeof(payload),
"%s,valid=1,location=%s,host=%s freq=%d.%03d" "%s,valid=1,location=%s,host=%s freq=%d.%03d"
#ifdef OpenBSD #ifdef OpenBSD
" %llu" " %llu"
#else #else
" %lu" " %lu"
#endif #endif
"", "",
handle->influxMeasurement, location, buf->s.deviceId, handle->influxMeasurement, location, buf->s.deviceId,
frequency_before_point, frequency_behind_point, frequency_before_point, frequency_behind_point,
timestamp); timestamp);
if (res > sizeof(payload)) { if (res > sizeof(payload)) {
logmsg(LOG_ERR, "payload buffer to small"); logmsg(LOG_ERR, "payload buffer to small");
return -1; return -1;
} }
logmsg(LOG_DEBUG, "Payload: %s", payload); logmsg(LOG_DEBUG, "Payload: %s", payload);
res = httpPostRequest(handle->influxUrl, handle->influxUser, handle->influxPass, payload); res = httpPostRequest(handle->influxUrl, handle->influxUser, handle->influxPass, payload);
if (res == 0) { if (res == 0) {
logmsg(LOG_DEBUG, "Successfully sent to InfluxDB"); logmsg(LOG_DEBUG, "Successfully sent to InfluxDB");
} }
} else { } else {
logmsg(LOG_ERR, "%u out of bound", buf->s.frequency[j]); logmsg(LOG_ERR, "%u out of bound, ignored", buf->s.frequency[j]);
} }
} }