Skip to content

Commit 7cc4ac2

Browse files
author
Isaac Connor
committed
Remove default of NOW from UpdatedOn in Monitor_Status field because old mysql can't handle it. Explicilty set it in zmc.
Fixes #4155
1 parent fdf1869 commit 7cc4ac2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

db/zm_update-1.36.34.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SET @s = (SELECT IF(
44
AND column_name = 'UpdatedOn'
55
) > 0,
66
"SELECT 'Column UpdatedOn already exists in Monitor_Status'",
7-
"ALTER TABLE `Monitor_Status` ADD `UpdatedOn` datetime NOT NULL default NOW() AFTER CaptureBandwidth"
7+
"ALTER TABLE `Monitor_Status` ADD `UpdatedOn` datetime NOT NULL AFTER CaptureBandwidth"
88
));
99

1010
PREPARE stmt FROM @s;

src/zmc.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ int main(int argc, char *argv[]) {
247247
monitor->setHeartbeatTime(now);
248248

249249
snprintf(sql, sizeof(sql),
250-
"INSERT INTO Monitor_Status (MonitorId,Status,CaptureFPS,AnalysisFPS)"
251-
" VALUES (%u, 'Running',0,0) ON DUPLICATE KEY UPDATE Status='Running',CaptureFPS=0,AnalysisFPS=0,CaptureBandwidth=0",
250+
"INSERT INTO Monitor_Status (MonitorId,Status,CaptureFPS,AnalysisFPS,UpdatedOn)"
251+
" VALUES (%u, 'Running',0,0,NOW()) ON DUPLICATE KEY UPDATE Status='Running',CaptureFPS=0,AnalysisFPS=0,CaptureBandwidth=0,UpdatedOn=NOW()",
252252
monitor->Id());
253253
zmDbDo(sql);
254254

@@ -268,7 +268,7 @@ int main(int argc, char *argv[]) {
268268
if (zm_terminate) break;
269269

270270
snprintf(sql, sizeof(sql),
271-
"INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'Connected') ON DUPLICATE KEY UPDATE Status='Connected'",
271+
"INSERT INTO Monitor_Status (MonitorId,Status,UpdatedOn) VALUES (%u, 'Connected', NOW()) ON DUPLICATE KEY UPDATE Status='Connected',UpdatedOn=NOW()",
272272
monitor->Id());
273273
zmDbDo(sql);
274274
} // end foreach monitor
@@ -373,7 +373,7 @@ int main(int argc, char *argv[]) {
373373
for (std::shared_ptr<Monitor> &monitor : monitors) {
374374
static char sql[ZM_SQL_SML_BUFSIZ];
375375
snprintf(sql, sizeof(sql),
376-
"INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'NotRunning') ON DUPLICATE KEY UPDATE Status='NotRunning',CaptureFPS=0,AnalysisFPS=0,CaptureBandwidth=0",
376+
"INSERT INTO Monitor_Status (MonitorId,Status,UpdatedOn) VALUES (%u, 'NotRunning') ON DUPLICATE KEY UPDATE Status='NotRunning',CaptureFPS=0,AnalysisFPS=0,CaptureBandwidth=0,NOW()",
377377
monitor->Id());
378378
zmDbDo(sql);
379379
}

0 commit comments

Comments
 (0)