Adds immediate migration results in progress

This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071

No files matched your search

@@ -67,7 +67,7 @@ void HlaDispatcher::onHlaConnected()
void HlaDispatcher::onHlaDisconnected()
{
INFO_LOG() << "Hla socket disconnected";
INFO_LOG(m_logger) << "Hla socket disconnected";
m_webSocketReconnectTimer->start(5000);
m_sendToHla->onHlaDisconnected();
@@ -85,7 +85,7 @@ void HlaDispatcher::onWebSocketError()
if (!m_webSocket)
return;
if (!m_bWarnedOnce)
WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
m_webSocket->close();
m_webSocketReconnectTimer->start(5000);
m_bWarnedOnce = true;
@@ -41,8 +41,10 @@ Q_SIGNALS:
void broadcastTelegramsRequest(int equipmentNumber, int broadcastIndex, int resetCounter);
void wlsTelegramReceived(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
private:
NGL::INGLLogger &m_logger;
QUrl webSocketUrl() const;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
std::shared_ptr<HlaHandlerRx> m_recvFromHla;
std::shared_ptr<HlaHandlerTx> m_sendToHla;
@@ -11,11 +11,10 @@ namespace HlaJson
{
HlaHandlerRx::HlaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
HlaDispatcher *dispatcher)
: m_rxHandler(recvFromTabCb)
HlaDispatcher *dispatcher) : m_rxHandler(recvFromTabCb)
, m_dispatcher(dispatcher)
, m_bWarnedOnce(false)
{}
, m_bWarnedOnce(false),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
{
@@ -24,7 +23,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
if (baJson.isEmpty())
return false;
const QJsonObject obj = QJsonDocument::fromJson(baJson).object();
TRACE_LOG() << "incoming telegram: " << baJson;
TRACE_LOG(m_logger) << "incoming telegram: " << baJson;
@@ -39,7 +38,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
if (!typeId.isDouble())
{
ERROR_LOG() << "Can not read type id: " << baJson;
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
return false;
}
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -125,7 +124,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
}
catch (const std::exception &e)
{
WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
return false;
}
return true;
@@ -138,7 +137,7 @@ void HlaHandlerRx::rxData(const T &data)
{
if (!m_bWarnedOnce)
{
ERROR_LOG() << "No RecvFromTab available";
ERROR_LOG(m_logger) << "No RecvFromTab available";
m_bWarnedOnce = true;
}
return;
@@ -24,9 +24,11 @@ public:
Q_SIGNALS:
void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
private:
NGL::INGLLogger &m_logger;
template<typename T>
void rxData(const T &data);
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
HlaDispatcher *m_dispatcher;
bool m_bWarnedOnce;
@@ -295,7 +295,7 @@ bool HlaHandlerTx::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
void HlaHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
{
INFO_LOG() << "onParticipantConnectionState - " << equipmentNumber
INFO_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
<< ", communication possible: " << dataCommunicationPossible;
if (equipmentNumber == -1)
m_dataCommunicationPossible.clear();
@@ -314,7 +314,7 @@ bool HlaHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegr
const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
DEBUG_LOG() << "Sending tele: " << ba;
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
m_webSocket->sendTextMessage(QString::fromUtf8(ba));
return true;
}
@@ -73,8 +73,10 @@ public:
public Q_SLOTS:
void onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
private:
NGL::INGLLogger &m_logger;
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, bool bForce = false);
private:
NGL::INGLLogger &m_logger;
QHash<int, bool> m_dataCommunicationPossible;
TrainingAreaBase::Plugin::DataProvider *m_pdp;
QWebSocket *m_webSocket;
@@ -31,6 +31,8 @@ public:
const char *name() const override { return tr_lts("dds", "HlaJson"); }
private:
NGL::INGLLogger &m_logger;
HlaDispatcher *m_wlsDispatcher;
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
@@ -68,6 +68,7 @@ public:
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override { return false; };
private:
NGL::INGLLogger &m_logger;
template <typename T>
bool sendToTxMixin(const T *data);
private: