Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp

@@ -15,12 +15,11 @@
 namespace EffectShowClient
 {
 
-ConnectionHandlerTcp::ConnectionHandlerTcp(QObject *parent)
-  : QObject(parent)
+ConnectionHandlerTcp::ConnectionHandlerTcp(QObject *parent) : QObject(parent)
   , m_socket(nullptr)
   , m_timer(new QTimer(this))
-  , m_currentDataRead(QByteArray())
-{
+  , m_currentDataRead(QByteArray()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timer->setInterval(5000);
   connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);
 
@@ -54,27 +53,27 @@ bool ConnectionHandlerTcp::send(const QByteArray &message)
 
   if (!m_socket->isOpen())
   {
-    ERROR_LOG() << "Port is not opened!";
+    ERROR_LOG(m_logger) << "Port is not opened!";
     return false;
   }
 
   const QByteArray writeThis = LtsUtils::byteStreamFromEscMessage(message);
-  DEBUG_LOG() << "Send HEX:" << writeThis.toHex(' ');
+  DEBUG_LOG(m_logger) << "Send HEX:" << writeThis.toHex(' ');
   qint64 byteswritten = m_socket->write(writeThis);
-  DEBUG_LOG() << "Binary data:" << message.size();
-  DEBUG_LOG() << "Try sending: " << message.size();
+  DEBUG_LOG(m_logger) << "Binary data:" << message.size();
+  DEBUG_LOG(m_logger) << "Try sending: " << message.size();
 
   // Check for errors ---------------------------------------------
 
   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 != writeThis.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;
   }
 
@@ -87,10 +86,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() << ":" << m_socket->peerPort();
+  INFO_LOG(m_logger) << "(Re)openend tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort();
   return true;
 }
 
@@ -109,8 +108,8 @@ void ConnectionHandlerTcp::read()
   const QByteArray ba = m_socket->readAll();
   m_currentDataRead.append(ba);
 
-  //DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
-  DEBUG_LOG() << "Data size" << ba.size();
+  //DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
+  DEBUG_LOG(m_logger) << "Data size" << ba.size();
   int idxStart = -1;
   int idxEnd = -1;
   while ((idxStart = m_currentDataRead.indexOf(0x02)) >= 0 &&
@@ -122,27 +121,27 @@ void ConnectionHandlerTcp::read()
 
     QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
     m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
-    DEBUG_LOG() << "Data Message found: " << message.toHex(' ');
+    DEBUG_LOG(m_logger) << "Data Message found: " << message.toHex(' ');
     message = LtsUtils::byteStreamToEscMessage(message);
 
     if (message.size() > 2)
     {
-      ERROR_LOG() << "Message to long: " << message.size();
+      ERROR_LOG(m_logger) << "Message to long: " << message.size();
       continue;
     }
 
-    DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
+    DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
     //got message now remove frame
 
 
     unsigned int byte = 0;
     byte = message.at(0) & 0xFF;
-    DEBUG_LOG() << "ConnectionHandler::read var byte is" << byte;
+    DEBUG_LOG(m_logger) << "ConnectionHandler::read var byte is" << byte;
 
 
     if (!isValidCommandByte(byte))
     {
-      ERROR_LOG() << "ConnectionHandler::read Commandbyte is invalid. Returning";
+      ERROR_LOG(m_logger) << "ConnectionHandler::read Commandbyte is invalid. Returning";
       return;
     }
 
@@ -153,29 +152,29 @@ void ConnectionHandlerTcp::read()
       if (message.size() > 1 &&
           !isValidPayloadByte(message.at(1)))
       {
-        ERROR_LOG() << "ConnectionHandler::read Payloadbyte is invalid. Returning";
+        ERROR_LOG(m_logger) << "ConnectionHandler::read Payloadbyte is invalid. Returning";
         continue;
       }
     }
 
     if (message.size() != 2)
     {
-      ERROR_LOG() << "ConnectionHandler::read No 2nd byte was appended (QByteArray has bad size). Returning.";
+      ERROR_LOG(m_logger) << "ConnectionHandler::read No 2nd byte was appended (QByteArray has bad size). Returning.";
       continue;
     }
 
-    DEBUG_LOG() << "Binary data from serial port: " << message.toHex(' ');
+    DEBUG_LOG(m_logger) << "Binary data from serial port: " << message.toHex(' ');
 
     emit received(message);
   }
 
   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()) +
@@ -187,20 +186,20 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
   case QTcpSocket::SocketError::SocketAccessError:
   case QTcpSocket::SocketError::SocketResourceError:
   {
-    ERROR_LOG() << "Closing port WITHOUT trying to reopen it.";
+    ERROR_LOG(m_logger) << "Closing port WITHOUT trying to reopen it.";
     close();
     m_timer->start();
     Q_FALLTHROUGH();
   }
   case QTcpSocket::SocketError::RemoteHostClosedError:
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     m_timer->start();
     break;
   }
   default:
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     close();
     m_timer->start();
     break;
@@ -210,7 +209,7 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
 
 bool ConnectionHandlerTcp::isValidCommandByte(const unsigned char command)
 {
-  DEBUG_LOG() << "ConnectionHandler::isValidCommandByte" << command << (command == 192 ||
+  DEBUG_LOG(m_logger) << "ConnectionHandler::isValidCommandByte" << command << (command == 192 ||
                                                                                 command == 240 ||
                                                                                 command == 244 ||
                                                                                 command == 255 ||