ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename diagpipe-r so that we don't have to create directories in SOCKS_DIR

pull/3085/head
Isaac Connor 2020-11-13 17:05:03 -05:00
parent a0dcdd135a
commit d2a203014f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/zm_fifo.cpp
View File

@ -57,8 +57,8 @@ static bool zmFifoDbgOpen() {
int zmFifoDbgInit(Monitor *monitor) {
zm_fifodbg_inited = true;
snprintf(zm_fifodbg_log, sizeof(zm_fifodbg_log), "%s/%d/dbgpipe.log",
monitor->getStorage()->Path(), monitor->Id());
snprintf(zm_fifodbg_log, sizeof(zm_fifodbg_log), "%s/dbgpipe-%d.log",
staticConfig.PATH_SOCKS.c_str(), monitor->Id());
zmFifoDbgOpen();
return 1;
}
@ -211,17 +211,18 @@ void FifoStream::setStreamStart(int monitor_id, const char * format) {
if ( !strcmp(format, "reference") ) {
stream_type = MJPEG;
filename = "diagpipe-r.jpg";
snprintf(diag_path, sizeof(diag_path), "%s/diagpipe-r-%d.jpg",
staticConfig.PATH_SOCKS.c_str(), monitor->Id());
} else if ( !strcmp(format, "delta") ) {
filename = "diagpipe-d.jpg";
snprintf(diag_path, sizeof(diag_path), "%s/diagpipe-d-%d.jpg",
staticConfig.PATH_SOCKS.c_str(), monitor->Id());
stream_type = MJPEG;
} else {
snprintf(diag_path, sizeof(diag_path), "%s/dbgpipe-%d.log",
staticConfig.PATH_SOCKS.c_str(), monitor->Id());
stream_type = RAW;
filename = "dbgpipe.log";
}
snprintf(diag_path, sizeof(diag_path), "%s/%d/%s",
staticConfig.PATH_SOCKS.c_str(), monitor->Id(), filename);
setStreamStart(diag_path);
}

4
src/zm_monitor.cpp
View File

@ -516,8 +516,8 @@ Monitor::Monitor(
if ( config.record_diag_images ) {
if ( config.record_diag_images_fifo ) {
diag_path_ref = stringtf("%s/%d/diagpipe-r.jpg", staticConfig.PATH_SOCKS.c_str(), id);
diag_path_delta = stringtf("%s/%d/diagpipe-d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
diag_path_ref = stringtf("%s/diagpipe-r-%d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
diag_path_delta = stringtf("%s/diagpipe-d-%d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
FifoStream::fifo_create_if_missing(diag_path_ref.c_str());
FifoStream::fifo_create_if_missing(diag_path_delta.c_str());
} else {