ETM-Schurig
/
powersync-plugins-modbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nymea-plugins-modbus: Fix spaming logs in SMA integration 

When SMA integration can't join the multicast group it begins spaming the log each 5s.
With this commit it logs the joining problem each 5s for the first minute, after that each 10min.

Signed-off-by: Martin Lukas <martin.lukas@chargebyte.com>
master
Martin Lukas 2024-10-28 11:17:48 +01:00
parent 8d85307f46
commit 4fe0e53a1b
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sma/speedwire/speedwireinterface.cpp
View File

@ -147,10 +147,21 @@ void SpeedwireInterface::reconfigureMulticastGroup()
qCDebug(dcSma()) << "Reconfigure multicast interfaces"; qCDebug(dcSma()) << "Reconfigure multicast interfaces";
if (m_multicast->joinMulticastGroup(Speedwire::multicastAddress())) { if (m_multicast->joinMulticastGroup(Speedwire::multicastAddress())) {
qCDebug(dcSma()) << "SpeedwireInterface: Joined successfully multicast group" << Speedwire::multicastAddress().toString(); qCDebug(dcSma()) << "SpeedwireInterface: Joined successfully multicast group" << Speedwire::multicastAddress().toString();
m_multicastWarningPrintCount = 0;
} else { } else {
qCWarning(dcSma()) << "SpeedwireInterface: Failed to join multicast group" << Speedwire::multicastAddress().toString() << m_multicast->errorString() << "Retrying in 5 seconds...";
// FIXME: It would probably be better to monitor the network interfaces and re-join if necessary // FIXME: It would probably be better to monitor the network interfaces and re-join if necessary
uint mod = m_multicastWarningPrintCount % 120;
if (m_multicastWarningPrintCount < 12) {
qCWarning(dcSma()) << "SpeedwireInterface: Failed to join multicast group" << Speedwire::multicastAddress().toString() << m_multicast->errorString() << "Retrying in 5 seconds...";
}
if (m_multicastWarningPrintCount >= 12 && mod == 0) {
qCWarning(dcSma()) << "SpeedwireInterface: Failed to join multicast group" << Speedwire::multicastAddress().toString() << m_multicast->errorString() << "Retrying in 10 minutes...";
}
QTimer::singleShot(5000, this, &SpeedwireInterface::reconfigureMulticastGroup); QTimer::singleShot(5000, this, &SpeedwireInterface::reconfigureMulticastGroup);
m_multicastWarningPrintCount++;
} }
// foreach (const QNetworkInterface &interface, QNetworkInterface::allInterfaces()) { // foreach (const QNetworkInterface &interface, QNetworkInterface::allInterfaces()) {

1
sma/speedwire/speedwireinterface.h
View File

@ -70,6 +70,7 @@ private:
quint32 m_sourceSerialNumber = 0; quint32 m_sourceSerialNumber = 0;
bool m_available = false; bool m_available = false;
QTimer m_multicastReconfigureationTimer; QTimer m_multicastReconfigureationTimer;
uint m_multicastWarningPrintCount = 0;
}; };