Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.cpp

@@ -65,7 +65,7 @@ void Api::sendHitResult(const HitResult &hitResult, const QMap <int, Contaminati
     tele.hitResult.contaminations += csi;
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO << ", tele = " << tele.toJson();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", tele = " << tele.toJson();
 
   m_webSocketHandler->sendTelegram(&tele, ws);
 }
@@ -141,7 +141,7 @@ void Api::sendEffectOverrides(const QString &segment,
 
 void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tele)
 {
-  DEBUG_LOG() << "tele->telegramId(): " << tele->telegramId();
+  DEBUG_LOG(m_logger) << "tele->telegramId(): " << tele->telegramId();
 
   if (tele->telegramId() == Telegrams::SetDamageState::telegramId())
   {
@@ -271,7 +271,7 @@ void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tel
     emit getBsmTechnicalStatus(tel->sensorId);
     return;
   }
-  WARNING_LOG() << "Received unhandled telegram " << tele->telegramId();
+  WARNING_LOG(m_logger) << "Received unhandled telegram " << tele->telegramId();
 }
 
 

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h

@@ -76,6 +76,7 @@ Q_SIGNALS:
 private Q_SLOTS:
   void onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tele);
 private:
+NGL::INGLLogger &m_logger;
   WebSocketHandler *m_webSocketHandler;
 };
 } 

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp

@@ -11,10 +11,9 @@ namespace BuildingControlUnit
 {
 namespace Json
 {
-WebSocketHandler::WebSocketHandler(QObject *parent)
-  : QObject(parent)
-  , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this))
-{}
+WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
+  , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 WebSocketHandler::~WebSocketHandler()
 {
@@ -30,7 +29,7 @@ bool WebSocketHandler::init(quint16 listenPort)
 {
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
+    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
     return false;
   }
   
@@ -48,7 +47,7 @@ bool WebSocketHandler::sendTelegram(const Telegrams::BaseTelegram *tele, QWebSoc
     return false;
 
   const QString jsonStr = QString::fromUtf8(tele->toJson());
-  DEBUG_LOG() << "jsonStr" << jsonStr;
+  DEBUG_LOG(m_logger) << "jsonStr" << jsonStr;
 
   bool bOk = false;
   for (QWebSocket *ws : std::as_const(m_webSockets))
@@ -68,7 +67,7 @@ void WebSocketHandler::onNewConnection()
   QWebSocket *ws = m_webSocketServer->nextPendingConnection();
   if (!ws)
     return;
-  DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
+  DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
 
   connect(ws, &QWebSocket::textMessageReceived,
           this, &WebSocketHandler::onTextMessageReceived);
@@ -82,11 +81,11 @@ void WebSocketHandler::onNewConnection()
 
 void WebSocketHandler::onTextMessageReceived(const QString &msg)
 {
-  DEBUG_LOG() << "new text message: " << msg;
+  DEBUG_LOG(m_logger) << "new text message: " << msg;
   auto tele = std::shared_ptr<Telegrams::BaseTelegram>(Telegrams::BaseTelegram::telegramFromJson(msg.toUtf8()));
   if (!tele)
   {
-    WARNING_LOG() << "Error parsing incoming json data: '" << msg << "'";
+    WARNING_LOG(m_logger) << "Error parsing incoming json data: '" << msg << "'";
     return;
   }
   emit telegramReceived(tele);

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h

@@ -41,6 +41,7 @@ private Q_SLOTS:
   void onWebSocketDisconnected();
   void onTextMessageReceived(const QString &msg);
 private:
+  NGL::INGLLogger &m_logger;
   QWebSocketServer *m_webSocketServer;
   QSet<QWebSocket *> m_webSockets;
 };