Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp

@@ -10,9 +10,8 @@
 namespace TrainingAreaBaseOC
 {
 
-ConnectionHandlerTcp::ConnectionHandlerTcp()
-  : m_timer(new QTimer(this))
-{
+ConnectionHandlerTcp::ConnectionHandlerTcp() : m_timer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timer->setInterval(5000);
   connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);
 }
@@ -44,25 +43,25 @@ bool ConnectionHandlerTcp::send(const LtsUtils::SfmMessage &message)
 
   if (!m_socket->isOpen())
   {
-    ERROR_LOG() << "Port is not opened!";
+    ERROR_LOG(m_logger) << "Port is not opened!";
     return false;
   }
 
   QByteArray data = LtsUtils::byteStreamFromSfmMessage(message);
 
-  DEBUG_LOG() << "Sending frame: " << data.toHex(' ');
+  DEBUG_LOG(m_logger) << "Sending frame: " << data.toHex(' ');
 
   const qint64 byteswritten = m_socket->write(data);
 
   if (byteswritten == -1)
   {
-    ERROR_LOG() << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
     m_timer->start();
     return false;
   }
   else if (byteswritten != data.size())
   {
-    ERROR_LOG() << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
     return false;
   }
 
@@ -75,10 +74,10 @@ bool ConnectionHandlerTcp::open()
   m_socket->connectToHost(Settings::hostName(), Settings::port());
   if (!m_socket->waitForConnected())
   {
-    ERROR_LOG() << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
     return false;
   }
-  INFO_LOG() << "(Re)openend tcp destination " << m_socket->peerName() << ":" <<  Settings::port();
+  INFO_LOG(m_logger) << "(Re)openend tcp destination " << m_socket->peerName() << ":" <<  Settings::port();
   return true;
 }
 
@@ -97,7 +96,7 @@ void ConnectionHandlerTcp::read()
   const QByteArray ba = m_socket->readAll();
   m_currentDataRead.append(ba);
 
-  DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
+  DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
 
   int idxStart = -1;
   int idxEnd = -1;
@@ -107,7 +106,7 @@ void ConnectionHandlerTcp::read()
     QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
 
     LtsUtils::SfmMessage sfmMsg;
-    DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
+    DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
 
     try
     {
@@ -115,11 +114,11 @@ void ConnectionHandlerTcp::read()
     }
     catch (const LtsUtils::ConversionError &ex)
     {
-      ERROR_LOG() << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
-      ERROR_LOG() << "Faulty Data from sfm as binary " << message.toHex();
+      ERROR_LOG(m_logger) << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
+      ERROR_LOG(m_logger) << "Faulty Data from sfm as binary " << message.toHex();
     }
 
-    INFO_LOG() << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
+    INFO_LOG(m_logger) << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
 
     m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
 
@@ -127,12 +126,12 @@ void ConnectionHandlerTcp::read()
   }
 
   if (m_socket->bytesAvailable() > 0)
-    DEBUG_LOG() << "Still " << m_socket->bytesAvailable() << " available to be read";
+    DEBUG_LOG(m_logger) << "Still " << m_socket->bytesAvailable() << " available to be read";
 }
 
 void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
 {
-  DEBUG_LOG() << "Spontaneous error " << error << " doesn't have to be an error ...";
+  DEBUG_LOG(m_logger) << "Spontaneous error " << error << " doesn't have to be an error ...";
 
   const QString errStr(QStringLiteral("QTcpSocket::SocketError ") + QString::number(error) +
                        QStringLiteral(" from tcp port ") + QString::number(m_socket->peerPort()) +
@@ -144,20 +143,20 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
   case QTcpSocket::SocketError::SocketAccessError:
   case QTcpSocket::SocketError::SocketResourceError:
   {
-    ERROR_LOG() << "Closing port trying to reopen it.";
+    ERROR_LOG(m_logger) << "Closing port trying to reopen it.";
     close();
     m_timer->start();
     Q_FALLTHROUGH();
   }
   case QTcpSocket::SocketError::RemoteHostClosedError:
   {
-    ERROR_LOG() << "Host closed trying to reopen.";
+    ERROR_LOG(m_logger) << "Host closed trying to reopen.";
     m_timer->start();
     break;
   }
   default:
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     close();
     m_timer->start();
     break;