# HG changeset patch # User Michiel Broek # Date 1570732959 -7200 # Node ID a8a6901b5a994eef7d6dfaec0b118e9fdb40ffe9 # Parent 9c41e865144a9c0b0f8e2745e3e6ef78c26f1211 Added CO2 meter units to the daemon. diff -r 9c41e865144a -r a8a6901b5a99 bmsd/Makefile --- a/bmsd/Makefile Wed Oct 09 22:39:46 2019 +0200 +++ b/bmsd/Makefile Thu Oct 10 20:42:39 2019 +0200 @@ -55,7 +55,7 @@ # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT # Dependencies generated by make depend -mqtt.o: bms.h xutil.h mqtt.h nodes.h fermenters.h +mqtt.o: bms.h xutil.h mqtt.h nodes.h fermenters.h co2meters.h lock.o: lock.h bms.h futil.h nodes.o: bms.h xutil.h nodes.h mysql.h futil.o: bms.h futil.h diff -r 9c41e865144a -r a8a6901b5a99 bmsd/bms.h --- a/bmsd/bms.h Wed Oct 09 22:39:46 2019 +0200 +++ b/bmsd/bms.h Thu Oct 10 20:42:39 2019 +0200 @@ -76,7 +76,7 @@ /** - * @brief Structure for the nodes. Database table 'nodes'. + * @brief Structure for the nodes. Database table 'mon_nodes'. */ typedef struct _sys_node_list { struct _sys_node_list *next; @@ -151,7 +151,7 @@ /** - * @brief Structure for the fermenters. Stored in database table 'fermenters'. + * @brief Structure for the fermenters. Stored in database table 'mon_fermenters'. */ typedef struct _fermenter_list { struct _fermenter_list *next; @@ -249,6 +249,47 @@ /** + * @brief Structure for the co2meters. Stored in database table 'mon_co2meters'. + */ +typedef struct _co2meter_list { + struct _co2meter_list *next; + char *uuid; ///< Fixed uuid string + char *alias; ///< Fixed short name + char *node; ///< Fixed node name + bool online; ///< Online status + char *mode; ///< Working mode + char *beercode; ///< Beer unique code + char *beername; ///< Beer name in fermenter + char *beeruuid; ///< Beer uuid in fermenter + char *temperature_state; ///< Temperature sensor state + char *temperature_address; ///< Temperature sensor address + float temperature; ///< Temperature value + char *pressure_state; ///< Pressure sensor state + uint8_t pressure_channel; ///< Pressure sensor channel + float pressure_voltage; ///< Pressure voltage reading + float pressure_zero; ///< Pressure zero offset voltage + float pressure_bar; ///< Pressure in bar +} sys_co2meter_list; + + +/** + * @brief Strcuture holding a co2 pressure log entry. + */ +typedef struct co2meter_log { + char *datetime; ///< Date/time stamp + char *product_uuid; ///< Product uuid + char *product_code; ///< Product code + char *product_name; ///< Product name + float temperature; ///< Temperature + float pressure; ///< Pressure + char *co2meter_uuid; ///< Unit uuid + char *co2meter_node; ///< Unit node + char *co2meter_alias; ///< Unit alias +} co2pressure_log; + + + +/** * @brief Brew computer controllers. Must have hardware + installation + recipe data. */ typedef struct _brewer_list { diff -r 9c41e865144a -r a8a6901b5a99 bmsd/co2meters.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bmsd/co2meters.c Thu Oct 10 20:42:39 2019 +0200 @@ -0,0 +1,346 @@ +/** + * @file co2meters.c + * @brief Handle co2meters status + * @author Michiel Broek + * + * Copyright (C) 2019 + * + * This file is part of the bms (Brewery Management System) + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * bms is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with ThermFerm; see the file COPYING. If not, write to the Free + * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + + +#include "bms.h" +#include "xutil.h" +#include "co2meters.h" +#include "mysql.h" + + +sys_co2meter_list *co2meters = NULL; + +extern int debug; +extern sys_config Config; + + + +void co2meter_set(char *edge_node, char *alias, char *payload) +{ + struct json_object *jobj, *val, *sensor; + sys_co2meter_list *co2meter, *tmpp; + bool new_co2meter = true; + +// fprintf(stdout, "co2meter_set: %s/%s %s\n", edge_node, alias, payload); + + /* + * Search co2meter record in the memory array and use it if found. + */ + if (co2meters) { + for (tmpp = co2meters; tmpp; tmpp = tmpp->next) { + if ((strcmp(tmpp->alias, alias) == 0) && (strcmp(tmpp->node, edge_node) == 0)) { + new_co2meter = false; + co2meter = tmpp; + break; + } + } + } + +// printf("new_co2meter %s\n", new_co2meter ? "true":"false"); + + /* + * Allocate new co2meter if not yet known. + */ + if (new_co2meter) { + co2meter = (sys_co2meter_list *)malloc(sizeof(sys_co2meter_list)); + memset(co2meter, 0, sizeof(sys_co2meter_list)); + co2meter->alias = xstrcpy(alias); + co2meter->node = xstrcpy(edge_node); + co2meter->mode = xstrcpy((char *)"OFF"); + } + + if (! co2meter->online) { + co2meter->online = true; + syslog(LOG_NOTICE, "Online co2meter %s/%s mode %s", edge_node, alias, co2meter->mode); + } + + /* + * Process the JSON formatted payload. + * Update only the fields that are found in the payload. + */ + jobj = json_tokener_parse(payload); + + if (json_object_object_get_ex(jobj, "uuid", &val)) { + if (co2meter->uuid) + free(co2meter->uuid); + co2meter->uuid = xstrcpy((char *)json_object_get_string(val)); + } + if (json_object_object_get_ex(jobj, "mode", &val)) { + if (co2meter->mode) { + if (strcmp(co2meter->mode, (char *)json_object_get_string(val))) { + syslog(LOG_NOTICE, "Change mode co2meter %s/%s: %s to %s", edge_node, alias, co2meter->mode, (char *)json_object_get_string(val)); + } + free(co2meter->mode); + } + co2meter->mode = xstrcpy((char *)json_object_get_string(val)); + } + if (json_object_object_get_ex(jobj, "temperature", &sensor)) { + if (json_object_object_get_ex(sensor, "address", &val)) { + if (co2meter->temperature_address) + free(co2meter->temperature_address); + co2meter->temperature_address = xstrcpy((char *)json_object_get_string(val)); + } + if (json_object_object_get_ex(sensor, "state", &val)) { + if (co2meter->temperature_state) + free(co2meter->temperature_state); + co2meter->temperature_state = xstrcpy((char *)json_object_get_string(val)); + } + if (json_object_object_get_ex(sensor, "temperature", &val)) { + co2meter->temperature = json_object_get_double(val); + } + } + if (json_object_object_get_ex(jobj, "pressure", &sensor)) { + if (json_object_object_get_ex(sensor, "state", &val)) { + if (co2meter->pressure_state) + free(co2meter->pressure_state); + co2meter->pressure_state = xstrcpy((char *)json_object_get_string(val)); + } + if (json_object_object_get_ex(sensor, "channel", &val)) { + co2meter->pressure_channel = json_object_get_int(val); + } + if (json_object_object_get_ex(sensor, "voltage", &val)) { + co2meter->pressure_voltage = json_object_get_double(val); + } + if (json_object_object_get_ex(sensor, "zero", &val)) { + co2meter->pressure_zero = json_object_get_double(val); + } + if (json_object_object_get_ex(sensor, "bar", &val)) { + co2meter->pressure_bar = json_object_get_double(val); + } + } + json_object_put(jobj); + +// co2meter_dump(co2meter); + + if (new_co2meter) { + if (co2meters == NULL) { + co2meters = co2meter; + } else { + for (tmpp = co2meters; tmpp; tmpp = tmpp->next) { + if (tmpp->next == NULL) { + tmpp->next = co2meter; + break; + } + } + } + co2meter_mysql_insert(co2meter); + } else { + co2meter_mysql_update(co2meter); + } + +} + + + +/* + * With DBIRTH all active co2meters are publishd in an array. + */ +void co2meter_birth_data(char *topic, char *payload) +{ + char *message_type, *edge_node, *alias; + struct json_object *jobj, *val, *metric, *units, *unit; + int arraylen; + + strtok(topic, "/"); // ignore namespace + strtok(NULL, "/"); + message_type = strtok(NULL, "/"); + edge_node = strtok(NULL, "/\0"); + alias = strtok(NULL, "/\0"); + + if ((alias == NULL) && (strcmp("DBIRTH", message_type) == 0)) { + /* + * Global initial DBIRTH message with array of co2meters. + */ + jobj = json_tokener_parse(payload); + + if (json_object_object_get_ex(jobj, "metric", &metric)) { + if (json_object_object_get_ex(metric, "units", &units)) { + arraylen = json_object_array_length(units); + for (int i = 0; i < arraylen; i++) { + /* + * Parse the array of units + */ + unit = json_object_array_get_idx(units, i); + + if (json_object_object_get_ex(unit, "alias", &val)) { + if (alias) + free(alias); + alias = xstrcpy((char *)json_object_get_string(val)); + co2meter_set(edge_node, alias, (char *)json_object_to_json_string_ext(unit, 0)); + free(alias); + alias = NULL; + } + } + } + } + json_object_put(jobj); + return; + } + + /* + * The rest are errors. + */ + printf("ERROR co2meter_birth_data: %s %s %s\n", message_type, edge_node, alias); +} + + + +void co2meter_log(char *topic, char *payload) +{ + char *edge_node, *alias, *line, buf[65], *logfile; + struct json_object *jobj, *val, *metric; + co2pressure_log *log; + struct tm *mytime; + time_t timestamp; + FILE *fp; + + strtok(topic, "/"); // ignore namespace + strtok(NULL, "/"); // group_id + strtok(NULL, "/"); // message_type + edge_node = strtok(NULL, "/\0"); + alias = strtok(NULL, "/\0"); + + log = (co2pressure_log *)malloc(sizeof(co2pressure_log)); + memset(log, 0, sizeof(co2pressure_log)); + + log->co2meter_node = xstrcpy(edge_node); + log->co2meter_alias = xstrcpy(alias); + jobj = json_tokener_parse(payload); + + timestamp = time(NULL); + log->datetime = malloc(21); + mytime = localtime(×tamp); + snprintf(log->datetime, 20, "%04d-%02d-%02d %02d:%02d:%02d", + mytime->tm_year + 1900, mytime->tm_mon + 1, mytime->tm_mday, mytime->tm_hour, mytime->tm_min, mytime->tm_sec); + + if (json_object_object_get_ex(jobj, "metric", &metric)) { + +/* if (json_object_object_get_ex(metric2, "uuid", &val)) { + if (strcmp((char *)"(null)", json_object_get_string(val))) + log->product_uuid = xstrcpy((char *)json_object_get_string(val)); + } + if (json_object_object_get_ex(metric2, "code", &val)) { + if (strcmp((char *)"(null)", json_object_get_string(val))) + log->product_code = xstrcpy((char *)json_object_get_string(val)); + } + if (json_object_object_get_ex(metric2, "name", &val)) { + if (strcmp((char *)"(null)", json_object_get_string(val))) + log->product_name = xstrcpy((char *)json_object_get_string(val)); + } +*/ + if (json_object_object_get_ex(metric, "co2meter_uuid", &val)) { + if (strcmp((char *)"(null)", json_object_get_string(val))) + log->co2meter_uuid = xstrcpy((char *)json_object_get_string(val)); + } + if (json_object_object_get_ex(metric, "temperature", &val)) { + log->temperature = json_object_get_double(val); + } + if (json_object_object_get_ex(metric, "pressure", &val)) { + log->pressure = json_object_get_double(val); + } + } + json_object_put(jobj); + + /* + * Because co2meters are not so smart and don't hold product information + * search the missing pieces in the database. + */ + // log->co2meter_uuid is the search, fill: + // log->product_uuid log->product_name log->product_code + // log->co2meter_node log->co2meter_alias + + /* + * Build csv log line + */ + line = xstrcpy(log->datetime); + line = xstrcat(line, (char *)","); + snprintf(buf, 64, "%.3f", log->temperature); + line = xstrcat(line, buf); + line = xstrcat(line, (char *)","); + snprintf(buf, 64, "%.3f", log->pressure); + line = xstrcat(line, buf); + line = xstrcat(line, (char *)","); + line = xstrcat(line, log->co2meter_uuid); + + /* + * Build logfile name + */ + logfile = xstrcpy(Config.web_root); + logfile = xstrcat(logfile, (char *)"/log/co2pressure/"); + logfile = xstrcat(logfile, log->product_code); + logfile = xstrcat(logfile, (char *)" "); + logfile = xstrcat(logfile, log->product_name); + logfile = xstrcat(logfile, (char *)".log"); + + if (debug) + fprintf(stdout, "%s %s\n", logfile, line); + + fp = fopen(logfile, "a"); + if (fp) { + fprintf(fp, "%s\n", line); + fclose(fp); + } else { + syslog(LOG_NOTICE, "cannot append to `%s'", logfile); + } + + free(logfile); + logfile = NULL; + free(line); + line = NULL; + + if (log->datetime) + free(log->datetime); + if (log->product_uuid ) + free(log->product_uuid ); + if (log->product_code ) + free(log->product_code ); + if (log->product_name ) + free(log->product_name ); + if (log->co2meter_uuid) + free(log->co2meter_uuid); + if (log->co2meter_node) + free(log->co2meter_node); + if (log->co2meter_alias) + free(log->co2meter_alias); + free(log); +} + + + +void co2meter_dump(sys_co2meter_list *co2meter) +{ + if (debug) { + printf("uuid %s\n", co2meter->uuid); + printf("alias %s\n", co2meter->alias); + printf("node %s\n", co2meter->node); + printf("online %s\n", co2meter->online ? "yes":"no"); + printf("product %s / %s\n", co2meter->beercode, co2meter->beername); + printf("Temperature %-16s %10s %8.3f\n", co2meter->temperature_address, co2meter->temperature_state, co2meter->temperature); + printf("Pressure %10s %d %.3f %.3f %.3f\n", co2meter->pressure_state, co2meter->pressure_channel, + co2meter->pressure_voltage, co2meter->pressure_zero, co2meter->pressure_bar); + printf("mode %s\n", co2meter->mode); + } +} + + diff -r 9c41e865144a -r a8a6901b5a99 bmsd/co2meters.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bmsd/co2meters.h Thu Oct 10 20:42:39 2019 +0200 @@ -0,0 +1,26 @@ +/** + * @file co2meters.h + */ + +#ifndef _CO2METERS_H +#define _CO2METERS_H + +void co2meter_dump(sys_co2meter_list *co2meter); + +/** + * @brief Birth of a co2meter or data update. Create it in the database if + * never seen before, else just update the database entry. + * @param topic The MQTT topic string, contains the co2meter type and name. + * @param payload The JSON formatted payload with the co2meter details. + */ +void co2meter_birth_data(char *topic, char *payload); + +/** + * @brief Data logging from co2meters. + * @param topic The MQTT topic string, contains the co2meter type and name. + * @param payload The JSON formatted payload with the co2meter details. + */ +void co2meter_log(char *topic, char *payload); + + +#endif diff -r 9c41e865144a -r a8a6901b5a99 bmsd/mqtt.c --- a/bmsd/mqtt.c Wed Oct 09 22:39:46 2019 +0200 +++ b/bmsd/mqtt.c Thu Oct 10 20:42:39 2019 +0200 @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2017-2018 + * Copyright (C) 2017-2019 * * Michiel Broek * @@ -25,6 +25,7 @@ #include "mqtt.h" #include "nodes.h" #include "fermenters.h" +#include "co2meters.h" extern sys_config Config; @@ -98,7 +99,7 @@ topic = xstrcpy((char *)"mbv1.0/fermenters/#"); // Subscribe to fermenter messages. mosquitto_subscribe(mosq, NULL, topic, 0); free(topic); - topic = xstrcpy((char *)"mbv1.0/co2meter/#"); // Subscribe to co2meter messages. + topic = xstrcpy((char *)"mbv1.0/co2meters/#"); // Subscribe to co2meter messages. mosquitto_subscribe(mosq, NULL, topic, 0); free(topic); topic = NULL; @@ -170,6 +171,14 @@ fermenter_log(message->topic, (char *)message->payload); return; } + if (strstr(message->topic, (char *)"co2meters") && strstr(message->topic, (char *)"DBIRTH")) { + co2meter_birth_data(message->topic, (char *)message->payload); + return; + } + if (strstr(message->topic, (char *)"co2meters") && strstr(message->topic, (char *)"DLOG")) { + co2meter_log(message->topic, (char *)message->payload); + return; + } syslog(LOG_NOTICE, "MQTT: message callback %s :: %d", message->topic, message->payloadlen); } else { if (strstr(message->topic, (char *)"NBIRTH")) { diff -r 9c41e865144a -r a8a6901b5a99 bmsd/mysql.c --- a/bmsd/mysql.c Wed Oct 09 22:39:46 2019 +0200 +++ b/bmsd/mysql.c Thu Oct 10 20:42:39 2019 +0200 @@ -35,6 +35,7 @@ extern sys_config Config; extern sys_node_list *nodes; extern sys_fermenter_list *fermenters; +extern sys_co2meter_list *co2meters; extern int debug; @@ -60,7 +61,8 @@ { sys_node_list *node, *tmpp; sys_fermenter_list *fermenter, *tmpf; - int ncnt = 0, fcnt = 0; + sys_co2meter_list *co2meter, *tmpc; + int ccnt = 0, ncnt = 0, fcnt = 0; con = mysql_init(NULL); if (con == NULL) { @@ -226,7 +228,51 @@ } } - syslog(LOG_NOTICE, "MySQL: loaded %d nodes, %d fermenters", ncnt, fcnt); + if (mysql_query(con, "SELECT * FROM mon_co2meters")) { + syslog(LOG_NOTICE, "MySQL: SELECT * FROM mon_co2meters error %u (%s))", mysql_errno(con), mysql_error(con)); + } else { + res_set = mysql_store_result(con); + if (res_set == NULL) { + syslog(LOG_NOTICE, "MySQL: mysq_store_result error %u (%s))", mysql_errno(con), mysql_error(con)); + } else { + while ((row = mysql_fetch_row(res_set)) != NULL) { + co2meter = (sys_co2meter_list *)malloc(sizeof(sys_co2meter_list)); + memset(co2meter, 0, sizeof(sys_co2meter_list)); + co2meter->next = NULL; + co2meter->uuid = xstrcpy(row[1]); + co2meter->alias = xstrcpy(row[2]); + co2meter->node = xstrcpy(row[3]); + co2meter->online = 0; // Will be set later + co2meter->beercode = xstrcpy(row[5]); + co2meter->beername = xstrcpy(row[6]); + co2meter->beeruuid = xstrcpy(row[7]); + co2meter->mode = xstrcpy(row[8]); + co2meter->temperature_state = xstrcpy(row[9]); + co2meter->temperature_address = xstrcpy(row[10]); + co2meter->temperature = atof(row[11]); + co2meter->pressure_state = xstrcpy(row[12]); + co2meter->pressure_channel = atoi(row[13]); + co2meter->pressure_voltage = atof(row[14]); + co2meter->pressure_zero = atof(row[15]); + co2meter->pressure_bar = atof(row[16]); + + if (co2meters == NULL) { + co2meters = co2meter; + } else { + for (tmpc = co2meters; tmpc; tmpc = tmpc->next) { + if (tmpc->next == NULL) { + tmpc->next = co2meter; + break; + } + } + } + ccnt++; + } + mysql_free_result(res_set); + } + } + + syslog(LOG_NOTICE, "MySQL: loaded %d nodes, %d fermenters, %d co2meters", ncnt, fcnt, ccnt); return 0; } @@ -234,6 +280,7 @@ void bms_mysql_end(void) { + sys_co2meter_list *tmpp, *oldtmpp; sys_fermenter_list *tmpf, *oldtmpf; sys_node_list *tmpn, *oldtmpn; @@ -243,6 +290,28 @@ if (debug) fprintf(stdout, "MySQL: disconnected\n"); + for (tmpp = co2meters; tmpp; tmpp = oldtmpp) { + oldtmpp = tmpp->next; + if (tmpp->uuid) + free(tmpp->uuid); + if (tmpp->alias) + free(tmpp->alias); + if (tmpp->node) + free(tmpp->node); + if (tmpp->beercode) + free(tmpp->beercode); + if (tmpp->beername) + free(tmpp->beername); + if (tmpp->beeruuid) + free(tmpp->beeruuid); + if (tmpp->temperature_address) + free(tmpp->temperature_address); + if (tmpp->temperature_state) + free(tmpp->temperature_state); + if (tmpp->pressure_state) + free(tmpp->pressure_state); + free(tmpp); + } for (tmpf = fermenters; tmpf; tmpf = oldtmpf) { oldtmpf = tmpf->next; if (tmpf->uuid) @@ -531,3 +600,58 @@ } + +void co2meter_mysql_insert(sys_co2meter_list *co2meter) +{ + char *query = malloc(2560); + + snprintf(query, 2559, + "INSERT INTO mon_co2meters SET uuid='%s', alias='%s', node='%s', online='%d', mode='%s', " \ + "temperature_address='%s', temperature_state='%s', temperature='%.3f', " \ + "pressure_state='%s', pressure_channel='%d', pressure_voltage='%.3f', pressure_zero='%.3f', pressure_bar='%.3f'", + co2meter->uuid, co2meter->alias, co2meter->node, co2meter->online ? 1:0, co2meter->mode, + co2meter->temperature_address, co2meter->temperature_state, co2meter->temperature, + co2meter->pressure_state, co2meter->pressure_channel, co2meter->pressure_voltage, co2meter->pressure_zero, co2meter->pressure_bar); + + if (bms_mysql_query(query) == 0) { + syslog(LOG_NOTICE, "MySQL: insert new co2meter %s/%s", co2meter->node, co2meter->alias); + } + free(query); +} + + + +void co2meter_mysql_update(sys_co2meter_list *co2meter) +{ + char *query = malloc(2560); + + snprintf(query, 2559, + "UPDATE mon_co2meters SET online='%d', mode='%s', " \ + "temperature_address='%s', temperature_state='%s', temperature='%.3f', " \ + "pressure_state='%s', pressure_channel='%d', pressure_voltage='%.3f', pressure_zero='%.3f', pressure_bar='%.3f' " \ + "WHERE uuid='%s'", + co2meter->online ? 1:0, co2meter->mode, + co2meter->temperature_address, co2meter->temperature_state, co2meter->temperature, + co2meter->pressure_state, co2meter->pressure_channel, co2meter->pressure_voltage, co2meter->pressure_zero, co2meter->pressure_bar, + co2meter->uuid); + + bms_mysql_query(query); + free(query); +} + + + +void co2meter_mysql_death(char *node, char *alias) +{ + char *query = malloc(512); + + if (alias) + snprintf(query, 511, "UPDATE mon_co2meters SET online='0' WHERE node='%s' and alias='%s'", node, alias); + else + snprintf(query, 511, "UPDATE mon_co2meters SET online='0' WHERE node='%s'", node); + + bms_mysql_query(query); + free(query); +} + + diff -r 9c41e865144a -r a8a6901b5a99 bmsd/mysql.h --- a/bmsd/mysql.h Wed Oct 09 22:39:46 2019 +0200 +++ b/bmsd/mysql.h Thu Oct 10 20:42:39 2019 +0200 @@ -37,5 +37,9 @@ void fermenter_mysql_update(sys_fermenter_list *fermenter); void fermenter_mysql_death(char *node, char *alias); +void co2meter_mysql_insert(sys_co2meter_list *co2meter); +void co2meter_mysql_update(sys_co2meter_list *co2meter); +void co2meter_mysql_death(char *node, char *alias); + #endif diff -r 9c41e865144a -r a8a6901b5a99 bmsd/nodes.c --- a/bmsd/nodes.c Wed Oct 09 22:39:46 2019 +0200 +++ b/bmsd/nodes.c Thu Oct 10 20:42:39 2019 +0200 @@ -3,7 +3,7 @@ * @brief Handle nodes status * @author Michiel Broek * - * Copyright (C) 2018 + * Copyright (C) 2018-2019 * * This file is part of the bms (Brewery Management System) * @@ -33,6 +33,8 @@ extern int debug; extern sys_fermenter_list *fermenters; +extern sys_co2meter_list *co2meters; + void node_birth_data(char *topic, char *payload) @@ -244,6 +246,7 @@ { sys_node_list *tmpn; sys_fermenter_list *tmpf; + sys_co2meter_list *tmpc; time_t now = time(NULL); for (tmpn = nodes; tmpn; tmpn = tmpn->next) { @@ -261,6 +264,16 @@ } } } + + for (tmpc = co2meters; tmpc; tmpc = tmpc->next) { + if (strcmp(tmpc->node, tmpn->node) == 0) { + if (tmpc->online) { + syslog(LOG_NOTICE, "Timeout co2meter %s/%s", tmpc->node, tmpc->alias); + tmpc->online = false; + co2meter_mysql_death(tmpc->node, tmpc->alias); + } + } + } } } }