修复问题
parent
36e5dc5197
commit
da7135e51b
|
@ -121,7 +121,7 @@ namespace zsy
|
||||||
|
|
||||||
oss = std::make_shared<OSS>(config);
|
oss = std::make_shared<OSS>(config);
|
||||||
|
|
||||||
mqttSvr = std::make_shared<MqttSvr>();
|
// mqttSvr = std::make_shared<MqttSvr>();
|
||||||
|
|
||||||
mqttCliHolder = std::make_shared<MqttCliHolder>(config, eventManager);
|
mqttCliHolder = std::make_shared<MqttCliHolder>(config, eventManager);
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace zsy
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EventManager::EventManager(): threadPool(std::make_shared<ThreadPool>("事件线程池", 4))
|
EventManager::EventManager(): threadPool(std::make_shared<ThreadPool>("事件线程池", 10))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ namespace zsy
|
||||||
// const auto file_sink = std::make_shared<spdlog::sinks::daily_file_format_sink_mt>(SysUtil::WORK_DIR + "\\logs\\deviceAccessLayer.log", 0, 0);
|
// const auto file_sink = std::make_shared<spdlog::sinks::daily_file_format_sink_mt>(SysUtil::WORK_DIR + "\\logs\\deviceAccessLayer.log", 0, 0);
|
||||||
auto file_sink = std::make_shared<DailyAndSizeSink>(
|
auto file_sink = std::make_shared<DailyAndSizeSink>(
|
||||||
SysUtil::WORK_DIR + "\\logs\\deviceAccessLayer.log",
|
SysUtil::WORK_DIR + "\\logs\\deviceAccessLayer.log",
|
||||||
100 * 1024 * 1024,
|
50 * 1024 * 1024,
|
||||||
15
|
15
|
||||||
);
|
);
|
||||||
file_sink->set_level(spdlog::level::info);
|
file_sink->set_level(spdlog::level::info);
|
||||||
|
|
|
@ -26,9 +26,8 @@ namespace zsy
|
||||||
|
|
||||||
void createThread();
|
void createThread();
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit ThreadPool(std::string name,uint16_t threadCount = std::thread::hardware_concurrency() * 2);
|
explicit ThreadPool(std::string name, uint16_t threadCount = std::thread::hardware_concurrency() * 2);
|
||||||
|
|
||||||
void submit(const std::function<void()> &task);
|
void submit(const std::function<void()> &task);
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
#include "barrier/generic_barrier.h"
|
#include "barrier/generic_barrier.h"
|
||||||
#include "platform_scale/generic_platform_scale.h"
|
#include "platform_scale/generic_platform_scale.h"
|
||||||
#include "sound_column/generic_sound_column.h"
|
#include "sound_column/generic_sound_column.h"
|
||||||
#include "vidicon/generic_vidicon.h"
|
// #include "vidicon/generic_vidicon.h"
|
||||||
// #include "vidicon/barrier_vidicon.h"
|
#include "vidicon/barrier_vidicon.h"
|
||||||
|
|
||||||
namespace zsy {
|
namespace zsy {
|
||||||
void DeviceHolder::initBarriers(std::vector<BarrierProperties> &configs)
|
void DeviceHolder::initBarriers(std::vector<BarrierProperties> &configs)
|
||||||
|
@ -39,8 +39,8 @@ namespace zsy {
|
||||||
{
|
{
|
||||||
for (auto &config: configs)
|
for (auto &config: configs)
|
||||||
{
|
{
|
||||||
vidicons.emplace(config.sn, std::make_shared<GenericVidicon>(config));
|
// vidicons.emplace(config.sn, std::make_shared<GenericVidicon>(config));
|
||||||
// vidicons.emplace(config.sn, std::make_shared<BarrierVidicon>(config));
|
vidicons.emplace(config.sn, std::make_shared<BarrierVidicon>(config));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue