ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't disconnect/reconnect while PrimeCapture is failing. Don't sleep if there is failure in capturing and zm_terminate is set.

This commit is contained in:
Isaac Connor 2021-02-24 10:29:26 -05:00
parent c8abeddc9c
commit 381b7e1b25
1 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/zmc.cpp
View File

@ -214,7 +214,6 @@ int main(int argc, char *argv[]) {
exit(-1);
} else {
Debug(2, "%d monitors loaded", monitors.size());
}
Info("Starting Capture version %s", ZM_VERSION);
@ -230,10 +229,9 @@ int main(int argc, char *argv[]) {
sigaddset(&block_set, SIGUSR2);
int result = 0;
int prime_capture_log_count = 0;
while ( !zm_terminate ) {
while (!zm_terminate) {
result = 0;
static char sql[ZM_SQL_SML_BUFSIZ];
for (const std::shared_ptr<Monitor> &monitor : monitors) {
@ -246,11 +244,10 @@ int main(int argc, char *argv[]) {
monitor->setStartupTime(now);
snprintf(sql, sizeof(sql),
"INSERT INTO Monitor_Status (MonitorId,Status,CaptureFPS,AnalysisFPS) VALUES (%d, 'Running',0,0) ON DUPLICATE KEY UPDATE Status='Running',CaptureFPS=0,AnalysisFPS=0",
monitor->Id());
if (mysql_query(&dbconn, sql)) {
Error("Can't run query: %s", mysql_error(&dbconn));
}
"INSERT INTO Monitor_Status (MonitorId,Status,CaptureFPS,AnalysisFPS)"
" VALUES (%d, 'Running',0,0) ON DUPLICATE KEY UPDATE Status='Running',CaptureFPS=0,AnalysisFPS=0",
monitor->Id());
zmDbDo(sql);
while (monitor->PrimeCapture() <= 0) {
if (prime_capture_log_count % 60) {
@ -259,22 +256,16 @@ int main(int argc, char *argv[]) {
Debug(1, "Failed to prime capture of initial monitor");
}
prime_capture_log_count ++;
monitor->disconnect();
if (zm_terminate) break;
sleep(5);
if (!monitor->connect()) {
Warning("Couldn't connect to monitor %d", monitor->Id());
}
sleep(1);
}
if (zm_terminate) break;
snprintf(sql, sizeof(sql),
"INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%d, 'Connected') ON DUPLICATE KEY UPDATE Status='Connected'",
monitor->Id());
if ( mysql_query(&dbconn, sql) ) {
Error("Can't run query: %s", mysql_error(&dbconn));
}
}
zmDbDo(sql);
} // end foreach monitor
#if HAVE_RTSP_SERVER
RTSPServerThread ** rtsp_server_threads = nullptr;
@ -300,12 +291,12 @@ int main(int argc, char *argv[]) {
capture_delays[i], alarm_capture_delays[i]);
Monitor::Function function = monitors[0]->GetFunction();
if ( function != Monitor::MONITOR ) {
if (function != Monitor::MONITOR) {
Debug(1, "Starting an analysis thread for monitor (%d)", monitors[i]->Id());
analysis_threads.emplace_back(ZM::make_unique<AnalysisThread>(monitors[i]));
}
#if HAVE_RTSP_SERVER
if ( rtsp_server_threads ) {
if (rtsp_server_threads) {
rtsp_server_threads[i] = new RTSPServerThread(monitors[i]);
rtsp_server_threads[i]->addStream(monitors[i]->GetVideoStream(), monitors[i]->GetAudioStream());
rtsp_server_threads[i]->start();
@ -363,17 +354,12 @@ int main(int argc, char *argv[]) {
}
} // end if has a last_capture time
last_capture_times[i] = now;
} // end foreach n_monitors
if (result < 0) {
if (result < 0 or zm_reload) {
// Failure, try reconnecting
break;
}
if ( zm_reload ) {
break;
}
} // end while ! zm_terminate and connected
for (std::unique_ptr<AnalysisThread> &analysis_thread: analysis_threads)
@ -410,7 +396,7 @@ int main(int argc, char *argv[]) {
delete [] capture_delays;
delete [] last_capture_times;
if (result < 0) {
if (result < 0 and !zm_terminate) {
// Failure, try reconnecting
Debug(1, "Sleeping for 5");
sleep(5);