nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missing add to poll queue

Browse Source
This commit is contained in:
John
2022-02-12 11:28:57 +01:00
parent 0aeb0a4aaf
commit 4a05f30155
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mqtthandler.cpp
+10 -3
View File
@@ -1415,7 +1415,9 @@ void MqttHandler::run() {
} }
if (!message->isWrite()) { if (!message->isWrite()) {
// only wait for data on read messages or set their poll prio // only wait for data on read messages or set their poll prio
if (filterSeen > 1 && (!message->getPollPriority() || message->getPollPriority() > filterSeen)) { if (filterSeen > 1 && (!message->getPollPriority() || message->getPollPriority() > filterSeen)
&& (filterPriority == 0 || filterSeen <= filterPriority)
) {
// check for poll prio adjustment after all other filters // check for poll prio adjustment after all other filters
checkPollAdjust = true; checkPollAdjust = true;
} else { } else {
@@ -1442,8 +1444,13 @@ void MqttHandler::run() {
if (!FileReader::matches(direction, filterDirection, true, true)) { if (!FileReader::matches(direction, filterDirection, true, true)) {
continue; continue;
} }
if ((checkPollAdjust && !message->setPollPriority(filterSeen)) if (checkPollAdjust) {
|| (filterPriority>0 && (message->getPollPriority()==0 || message->getPollPriority()>filterPriority))) { if (!message->setPollPriority(filterSeen)) {
continue;
}
m_messages->addPollMessage(false, message);
}
if (filterPriority>0 && (message->getPollPriority()==0 || message->getPollPriority()>filterPriority)) {
continue; continue;
} }