fix: сборка на SCPC и ШПС модемах
This commit is contained in:
@@ -970,7 +970,7 @@ nlohmann::json api_driver::obj::TerminalRxTxSettings::asJson() const {
|
|||||||
|
|
||||||
api_driver::obj::TerminalRxTxSettings::~TerminalRxTxSettings() = default;
|
api_driver::obj::TerminalRxTxSettings::~TerminalRxTxSettings() = default;
|
||||||
|
|
||||||
|
#ifdef API_OBJECT_MANAGER_LOGS_ENABLE
|
||||||
// Вспомогательная функция для получения отсортированного списка файлов логов
|
// Вспомогательная функция для получения отсортированного списка файлов логов
|
||||||
std::vector<std::string> getLogFilesSorted(const std::string& path) {
|
std::vector<std::string> getLogFilesSorted(const std::string& path) {
|
||||||
std::vector<std::string> files;
|
std::vector<std::string> files;
|
||||||
@@ -994,6 +994,7 @@ std::vector<std::string> getLogFilesSorted(const std::string& path) {
|
|||||||
|
|
||||||
return files;
|
return files;
|
||||||
}
|
}
|
||||||
|
|
||||||
api_driver::obj::TerminalManagerLogs::TerminalManagerLogs(const std::string& path): logsFileDir(path) {}
|
api_driver::obj::TerminalManagerLogs::TerminalManagerLogs(const std::string& path): logsFileDir(path) {}
|
||||||
|
|
||||||
std::string api_driver::obj::TerminalManagerLogs::loadPreview() {
|
std::string api_driver::obj::TerminalManagerLogs::loadPreview() {
|
||||||
@@ -1061,8 +1062,7 @@ void api_driver::obj::TerminalManagerLogs::loadFullLog(std::vector<char>& destDa
|
|||||||
}
|
}
|
||||||
|
|
||||||
api_driver::obj::TerminalManagerLogs::~TerminalManagerLogs() = default;
|
api_driver::obj::TerminalManagerLogs::~TerminalManagerLogs() = default;
|
||||||
|
#endif // API_OBJECT_MANAGER_LOGS_ENABLE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -15,8 +15,11 @@
|
|||||||
|
|
||||||
typedef boost::property_tree::ptree::path_type json_path;
|
typedef boost::property_tree::ptree::path_type json_path;
|
||||||
|
|
||||||
|
#ifdef API_OBJECT_MANAGER_LOGS_ENABLE
|
||||||
api_driver::ApiDriver::ApiDriver(): logs(MANAGER_LOGS_DIR) {};
|
api_driver::ApiDriver::ApiDriver(): logs(MANAGER_LOGS_DIR) {};
|
||||||
|
#else
|
||||||
|
api_driver::ApiDriver::ApiDriver() {};
|
||||||
|
#endif
|
||||||
|
|
||||||
void api_driver::ApiDriver::startDaemon() {
|
void api_driver::ApiDriver::startDaemon() {
|
||||||
if (daemon == nullptr) {
|
if (daemon == nullptr) {
|
||||||
|
Reference in New Issue
Block a user