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

zmc: Use fmt to construct the log ID

This commit is contained in:
Peter Keresztes Schmidt 2021-02-02 16:29:55 +01:00
parent 589e5fec26
commit 6dc132df27
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -92,6 +92,7 @@ target_link_libraries(zmc
PRIVATE
zm-core-interface
zm
fmt::fmt
${ZM_EXTRA_LIBS}
${ZM_BIN_LIBS}
${CMAKE_DL_LIBS})

17
src/zmc.cpp
View File

@ -63,6 +63,7 @@ possible, this should run at more or less constant speed.
#include "zm_signal.h"
#include "zm_time.h"
#include "zm_utils.h"
#include <fmt/format.h>
#include <getopt.h>
#include <iostream>
@ -169,24 +170,24 @@ int main(int argc, char *argv[]) {
exit(0);
}
char log_id_string[32] = "";
std::string logId;
if ( device[0] ) {
const char *slash_ptr = strrchr(device, '/');
snprintf(log_id_string, sizeof(log_id_string), "zmc_d%s", slash_ptr?slash_ptr+1:device);
logId = fmt::format("zmc_d{}", slash_ptr ? slash_ptr + 1 : device);
} else if ( host[0] ) {
snprintf(log_id_string, sizeof(log_id_string), "zmc_h%s", host);
logId = fmt::format("zmc_h{}", host);
} else if ( file[0] ) {
const char *slash_ptr = strrchr(file, '/');
snprintf(log_id_string, sizeof(log_id_string), "zmc_f%s", slash_ptr?slash_ptr+1:file);
logId = fmt::format("zmc_f{}", slash_ptr ? slash_ptr + 1 : file);
} else {
snprintf(log_id_string, sizeof(log_id_string), "zmc_m%d", monitor_id);
logId = fmt::format("zmc_m{}", monitor_id);
}
logInit(log_id_string);
logInit(logId.c_str());
zmLoadStaticConfig();
zmDbConnect();
zmLoadDBConfig();
logInit(log_id_string);
logInit(logId.c_str());
hwcaps_detect();
@ -409,7 +410,7 @@ int main(int argc, char *argv[]) {
monitor->Reload();
}
logTerm();
logInit(log_id_string);
logInit(logId.c_str());
zm_reload = false;
} // end if zm_reload
} // end while ! zm_terminate outer connection loop