Switch db_mutex to a std::mutex. Use modern locking with it. Use zmDbDo or dbQueue.push where appropriate. code cleanup.

This commit is contained in:
Isaac Connor committed 2021-02-25 12:26:26 -05:00
1 parent fdf515ca10
commit 8aeb4ab758
9 files changed
+135 -195

No files matched your search

+2 -3
View File
@@ -266,6 +266,7 @@ int main(int argc, char *argv[]) {
monitor->Id());
zmDbDo(sql);
} // end foreach monitor
if (zm_terminate) break;
#if HAVE_RTSP_SERVER
RTSPServerThread ** rtsp_server_threads = nullptr;
@@ -418,9 +419,7 @@ int main(int argc, char *argv[]) {
snprintf(sql, sizeof(sql),
"INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%d, 'Connected') ON DUPLICATE KEY UPDATE Status='NotRunning'",
monitor->Id());
if (mysql_query(&dbconn, sql)) {
Error("Can't run query: %s", mysql_error(&dbconn));
}
zmDbDo(sql);
}
Image::Deinitialise();