Mercurial > bms / file diff

--- a/bmsd/mysql.c	Tue Aug 28 21:45:35 2018 +0200
+++ b/bmsd/mysql.c	Wed Aug 29 14:44:12 2018 +0200
@@ -81,8 +81,8 @@
     /*
      * Restore nodes from the database
      */
-    if (mysql_query(con, "SELECT * FROM nodes")) {
-	syslog(LOG_NOTICE, "MySQL: SELECT * FROM nodes error %u (%s))", mysql_errno(con), mysql_error(con));
+    if (mysql_query(con, "SELECT * FROM mon_nodes")) {
+	syslog(LOG_NOTICE, "MySQL: SELECT * FROM mon_nodes error %u (%s))", mysql_errno(con), mysql_error(con));
     } else {
 	res_set = mysql_store_result(con);
 	if (res_set == NULL) {
@@ -130,8 +130,8 @@
 	}
     }
 
-    if (mysql_query(con, "SELECT * FROM fermenters")) {
-	syslog(LOG_NOTICE, "MySQL: SELECT * FROM fermenters error %u (%s))", mysql_errno(con), mysql_error(con));
+    if (mysql_query(con, "SELECT * FROM mon_fermenters")) {
+	syslog(LOG_NOTICE, "MySQL: SELECT * FROM mon_fermenters error %u (%s))", mysql_errno(con), mysql_error(con));
     } else {
 	res_set = mysql_store_result(con);
 	if (res_set == NULL) {
@@ -335,7 +335,7 @@
 		mytime->tm_year + 1900, mytime->tm_mon + 1, mytime->tm_mday, mytime->tm_hour, mytime->tm_min, mytime->tm_sec);
 
     snprintf(query, 511,
-	"INSERT INTO  nodes SET uuid='%s', node='%s', online='%s', group_id='%s', " \
+	"INSERT INTO  mon_nodes SET uuid='%s', node='%s', online='%s', group_id='%s', " \
         "hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', firstseen='%s', lastseen='%s', " \
 	"temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \
 	"net_address='%s', net_ifname='%s', net_rssi='%d'",
@@ -345,7 +345,7 @@
 	node->net_address, node->net_ifname, node->net_rssi);
 
     if (mysql_query(con, query)) {
-	syslog(LOG_NOTICE, "MySQL: INSERT INTO nodes error %u (%s))", mysql_errno(con), mysql_error(con));
+	syslog(LOG_NOTICE, "MySQL: INSERT INTO mon_nodes error %u (%s))", mysql_errno(con), mysql_error(con));
     } else {
 	syslog(LOG_NOTICE,  "MySQL: insert new node %s", node->node);
     }
@@ -365,7 +365,7 @@
     	mytime->tm_year + 1900, mytime->tm_mon + 1, mytime->tm_mday, mytime->tm_hour, mytime->tm_min, mytime->tm_sec);
 
     snprintf(query, 511,
-	"UPDATE  nodes SET online='%s', hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', lastseen='%s', " \
+	"UPDATE mon_nodes SET online='%s', hardwaremake='%s', hardwaremodel='%s', os='%s', os_version='%s', firmware='%s', lastseen='%s', " \
 	"temperature='%.3f', humidity='%.3f', barometer='%.3f', gps_latitude='%.8f', gps_longitude='%.8f', gps_altitude='%.8f', " \
 	"net_address='%s', net_ifname='%s', net_rssi='%d' WHERE uuid='%s'",
 	node->online ?"Y":"N", node->hardwaremake, node->hardwaremodel, node->os, node->os_version, node->firmware, last,
@@ -373,7 +373,7 @@
 	node->net_address, node->net_ifname, node->net_rssi, node->uuid);
 
     if (mysql_query(con, query)) {
-	syslog(LOG_NOTICE, "MySQL: UPDATE nodes error %u (%s))", mysql_errno(con), mysql_error(con));
+	syslog(LOG_NOTICE, "MySQL: UPDATE mon_nodes error %u (%s))", mysql_errno(con), mysql_error(con));
     }
 
     free(query);
@@ -385,11 +385,11 @@
 {
     char        *query = malloc(512);
 
-    snprintf(query, 511, "UPDATE  nodes SET online='N' WHERE node='%s'", node);
+    snprintf(query, 511, "UPDATE mon_nodes SET online='N' WHERE node='%s'", node);
 //    printf("%s\n", query);
 
     if (mysql_query(con, query)) {
-	syslog(LOG_NOTICE, "MySQL: UPDATE nodes error %u (%s))", mysql_errno(con), mysql_error(con));
+	syslog(LOG_NOTICE, "MySQL: UPDATE mon_nodes error %u (%s))", mysql_errno(con), mysql_error(con));
     }
 
     free(query);
@@ -402,7 +402,7 @@
     char        *query = malloc(2560);
 
     snprintf(query, 2559,
-	"INSERT INTO fermenters SET uuid='%s', alias='%s', node='%s', online='%s', " \
+	"INSERT INTO mon_fermenters SET uuid='%s', alias='%s', node='%s', online='%s', " \
 	"beercode='%s', beername='%s', " \
 	"air_address='%s', air_state='%s', air_temperature='%.3f', " \
 	"beer_address='%s', beer_state='%s', beer_temperature='%.3f', " \
@@ -436,7 +436,7 @@
 //    printf("%s\n", query);
 
     if (mysql_query(con, query)) {
-	syslog(LOG_NOTICE, "MySQL: INSERT INTO fermenters error %u (%s))", mysql_errno(con), mysql_error(con));
+	syslog(LOG_NOTICE, "MySQL: INSERT INTO mon_fermenters error %u (%s))", mysql_errno(con), mysql_error(con));
     } else {
 	syslog(LOG_NOTICE,  "MySQL: insert new fermenter %s/%s", fermenter->node, fermenter->alias);
     }
@@ -450,7 +450,7 @@
     char        *query = malloc(2560);
 
     snprintf(query, 2559,
-	"UPDATE fermenters SET online='%s', beercode='%s', beername='%s', " \
+	"UPDATE mon_fermenters SET online='%s', beercode='%s', beername='%s', " \
 	"air_address='%s', air_state='%s', air_temperature='%.3f', " \
 	"beer_address='%s', beer_state='%s', beer_temperature='%.3f', " \
 	"chiller_address='%s', chiller_state='%s', chiller_temperature='%.3f', " \
@@ -482,7 +482,7 @@
 //    printf("%s\n", query);
 
     if (mysql_query(con, query)) {
-	syslog(LOG_NOTICE, "MySQL: UPDATE fermenters error %u (%s))", mysql_errno(con), mysql_error(con));
+	syslog(LOG_NOTICE, "MySQL: UPDATE mon_fermenters error %u (%s))", mysql_errno(con), mysql_error(con));
     }
 
     free(query);
@@ -495,12 +495,12 @@
     char        *query = malloc(512);
 
     if (alias)
-    	snprintf(query, 511, "UPDATE  fermenters SET online='N' WHERE node='%s' and alias='%s'", node, alias);
+    	snprintf(query, 511, "UPDATE mon_fermenters SET online='N' WHERE node='%s' and alias='%s'", node, alias);
     else
-	snprintf(query, 511, "UPDATE  fermenters SET online='N' WHERE node='%s'", node);
+	snprintf(query, 511, "UPDATE mon_fermenters SET online='N' WHERE node='%s'", node);
 
     if (mysql_query(con, query)) {
-	syslog(LOG_NOTICE, "MySQL: UPDATE fermenters error %u (%s))", mysql_errno(con), mysql_error(con));
+	syslog(LOG_NOTICE, "MySQL: UPDATE mon_fermenters error %u (%s))", mysql_errno(con), mysql_error(con));
     }
 
     free(query);