Servd: Remove no devices found event
parent
7cca96dcfb
commit
87c10410e8
|
|
@ -167,7 +167,6 @@ static constexpr const char* SERVD_POLL_ERROR = "Error polling on Servd socket";
|
||||||
static constexpr const char* SERVD_NODATA_ERROR = "No data received from Servd";
|
static constexpr const char* SERVD_NODATA_ERROR = "No data received from Servd";
|
||||||
static constexpr const char* SERVD_JOIN_MULTICAST_ERROR = "Error joining Servd multicast group";
|
static constexpr const char* SERVD_JOIN_MULTICAST_ERROR = "Error joining Servd multicast group";
|
||||||
static constexpr const char* SERVD_NOT_REACHABLE = "Could not reach Servd; ensure it is installed and running";
|
static constexpr const char* SERVD_NOT_REACHABLE = "Could not reach Servd; ensure it is installed and running";
|
||||||
static constexpr const char* SERVD_NO_DEVICES_FOUND = "Servd is running but no devices found";
|
|
||||||
|
|
||||||
// DXX
|
// DXX
|
||||||
static constexpr const char* DXX_ERROR_SYS = "System error, check errno/GetLastError()";
|
static constexpr const char* DXX_ERROR_SYS = "System error, check errno/GetLastError()";
|
||||||
|
|
@ -442,8 +441,6 @@ const char* APIEvent::DescriptionForType(Type type) {
|
||||||
return SERVD_JOIN_MULTICAST_ERROR;
|
return SERVD_JOIN_MULTICAST_ERROR;
|
||||||
case Type::ServdNotReachable:
|
case Type::ServdNotReachable:
|
||||||
return SERVD_NOT_REACHABLE;
|
return SERVD_NOT_REACHABLE;
|
||||||
case Type::ServdNoDevicesFound:
|
|
||||||
return SERVD_NO_DEVICES_FOUND;
|
|
||||||
|
|
||||||
// DXX
|
// DXX
|
||||||
case Type::DXXErrorSys:
|
case Type::DXXErrorSys:
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,6 @@ void init_event(pybind11::module_& m) {
|
||||||
.value("ServdNoDataError", APIEvent::Type::ServdNoDataError)
|
.value("ServdNoDataError", APIEvent::Type::ServdNoDataError)
|
||||||
.value("ServdJoinMulticastError", APIEvent::Type::ServdJoinMulticastError)
|
.value("ServdJoinMulticastError", APIEvent::Type::ServdJoinMulticastError)
|
||||||
.value("ServdNotReachable", APIEvent::Type::ServdNotReachable)
|
.value("ServdNotReachable", APIEvent::Type::ServdNotReachable)
|
||||||
.value("ServdNoDevicesFound", APIEvent::Type::ServdNoDevicesFound)
|
|
||||||
.value("DXXErrorSys", APIEvent::Type::DXXErrorSys)
|
.value("DXXErrorSys", APIEvent::Type::DXXErrorSys)
|
||||||
.value("DXXErrorInt", APIEvent::Type::DXXErrorInt)
|
.value("DXXErrorInt", APIEvent::Type::DXXErrorInt)
|
||||||
.value("DXXErrorOverflow", APIEvent::Type::DXXErrorOverflow)
|
.value("DXXErrorOverflow", APIEvent::Type::DXXErrorOverflow)
|
||||||
|
|
|
||||||
|
|
@ -166,7 +166,6 @@ public:
|
||||||
ServdNoDataError = ServdBindError + 9,
|
ServdNoDataError = ServdBindError + 9,
|
||||||
ServdJoinMulticastError = ServdBindError + 10,
|
ServdJoinMulticastError = ServdBindError + 10,
|
||||||
ServdNotReachable = ServdBindError + 11,
|
ServdNotReachable = ServdBindError + 11,
|
||||||
ServdNoDevicesFound = ServdBindError + 12,
|
|
||||||
|
|
||||||
// DXX
|
// DXX
|
||||||
DXXErrorSys = 0x6100,
|
DXXErrorSys = 0x6100,
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,6 @@ void Servd::Find(std::vector<FoundDevice>& found) {
|
||||||
EventManager::GetInstance().add(APIEvent::Type::ServdTransceiveError, APIEvent::Severity::Error);
|
EventManager::GetInstance().add(APIEvent::Type::ServdTransceiveError, APIEvent::Severity::Error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const size_t preCount = found.size();
|
|
||||||
bool parseError = false;
|
bool parseError = false;
|
||||||
const auto lines = split(response, '\n');
|
const auto lines = split(response, '\n');
|
||||||
for(auto&& line : lines) {
|
for(auto&& line : lines) {
|
||||||
|
|
@ -96,9 +95,6 @@ void Servd::Find(std::vector<FoundDevice>& found) {
|
||||||
return std::make_unique<Servd>(err, forDevice, address);
|
return std::make_unique<Servd>(err, forDevice, address);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
if(!parseError && found.size() == preCount) {
|
|
||||||
EventManager::GetInstance().add(APIEvent::Type::ServdNoDevicesFound, APIEvent::Severity::EventInfo);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Servd::Servd(const device_eventhandler_t& err, neodevice_t& forDevice, const Address& address) :
|
Servd::Servd(const device_eventhandler_t& err, neodevice_t& forDevice, const Address& address) :
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue