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

fixes for openbsd

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2021-02-10 18:23:18 +01:00
parent 27551a0023
commit 778e288cb7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sink/logging.c
View File

@ -7,7 +7,7 @@
void logmsg(int prio, const char* format, ...) { void logmsg(int prio, const char* format, ...) {
va_list vl; va_list vl;
openlog("counter", 0, LOG_LOCAL0); openlog("counter", 0, LOG_LOCAL1);
va_start(vl, format); va_start(vl, format);
vsyslog(prio, format, vl); vsyslog(prio, format, vl);
//vprintf(format, vl); //vprintf(format, vl);

9
sink/sink20169.c
View File

@ -267,14 +267,14 @@ int forwardMinuteBuffer(t_forwarderHandle *handle, t_minuteBuffer *buf) {
const char *location = device->location; const char *location = device->location;
for (uint8_t j = 0; j < SECONDS_PER_MINUTE; j++) { for (uint8_t j = 0; j < SECONDS_PER_MINUTE; j++) {
logmsg(LOG_INFO, "Time: %lu, Frequency: %u", buf->s.events[j].timestamp, buf->s.events[j].frequency); logmsg(LOG_DEBUG, "Time: %lu, Frequency: %u", buf->s.events[j].timestamp, buf->s.events[j].frequency);
int frequency_before_point = buf->s.events[j].frequency / 1000; int frequency_before_point = buf->s.events[j].frequency / 1000;
int frequency_behind_point = buf->s.events[j].frequency - (frequency_before_point * 1000); int frequency_behind_point = buf->s.events[j].frequency - (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 %lu", "%s,valid=1,location=%s,host=%s freq=%d.%03d %llu",
handle->influxMeasurement, location, buf->s.deviceId, handle->influxMeasurement, location, buf->s.deviceId,
frequency_before_point, frequency_behind_point, frequency_before_point, frequency_behind_point,
buf->s.events[j].timestamp); buf->s.events[j].timestamp);
@ -282,13 +282,14 @@ int forwardMinuteBuffer(t_forwarderHandle *handle, t_minuteBuffer *buf) {
logmsg(LOG_ERR, "payload buffer to small"); logmsg(LOG_ERR, "payload buffer to small");
return -1; return -1;
} }
logmsg(LOG_INFO, "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_INFO, "Successfully sent to InfluxDB"); logmsg(LOG_DEBUG, "Successfully sent to InfluxDB");
} }
} }
logmsg(LOG_INFO, "Successfully sent whole minute to InfluxDB");
return 0; return 0;
} }