lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp
+20 -20
View File
@@ -26,7 +26,7 @@ TcpSocket::TcpSocket(const char *logName, QObject *parent)
, m_bSocketErrorWarnedOnce(false)
, m_logger(getLogger(logName))
{
DEBUG_LOG() << "CTOR TCP-Socket... " ;
DEBUG_LOG(m_logger) << "CTOR TCP-Socket... " ;
doConnect();
}
@@ -43,7 +43,7 @@ TcpSocket::~TcpSocket()
void TcpSocket::doConnect()
{
DEBUG_LOG() << "doConnect TCP-Socket " ;
DEBUG_LOG(m_logger) << "doConnect TCP-Socket " ;
if (m_socket)
m_socket->deleteLater();
@@ -60,7 +60,7 @@ void TcpSocket::doConnect()
if (m_tryReconnect)
{
INFO_LOG() << "Try reconnect to host " << m_hostName
INFO_LOG(m_logger) << "Try reconnect to host " << m_hostName
<< ":" << m_hostPort;
m_socket->connectToHost(m_hostName, m_hostPort);
}
@@ -69,7 +69,7 @@ void TcpSocket::doConnect()
void TcpSocket::start(const QString &hostName, quint16 port)
{
INFO_LOG() << "Try connect to host: " << hostName
INFO_LOG(m_logger) << "Try connect to host: " << hostName
<< ": " << port;
m_hostName = hostName;
@@ -81,7 +81,7 @@ void TcpSocket::start(const QString &hostName, quint16 port)
void TcpSocket::onConnected()
{
INFO_LOG() << "Connected to "
INFO_LOG(m_logger) << "Connected to "
<< m_socket->peerAddress().toString()
<< ":" << m_socket->peerPort();
m_bSocketErrorWarnedOnce = false;
@@ -95,46 +95,46 @@ void TcpSocket::onConnected()
// Das Setzen der Systemvariablen war ebenfalls ohne Auswirkung.
// Da diese Programmteile unter Windows eh so nicht zu uebersetzen sind, ist der Codeteil hier in Kommentar gesetzt.
// INFO_LOG() << "----Set TCP_KEEPIDLE parameter ";
// INFO_LOG(m_logger) << "----Set TCP_KEEPIDLE parameter ";
// const int keepAliveOption = 1; // on
// if (setsockopt(m_socket->socketDescriptor(), SOL_SOCKET, SO_KEEPALIVE, &keepAliveOption, sizeof(keepAliveOption)) != 0)
// {
// ERROR_LOG() << "Error setting SO_KEEPALIVE: " << errno;
// ERROR_LOG(m_logger) << "Error setting SO_KEEPALIVE: " << errno;
// }
// const int idleTimeout = 5; // sec
// if (setsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPIDLE, &idleTimeout, sizeof(idleTimeout)) != 0)
// {
// ERROR_LOG() << "Error setting TCP_KEEPIDLE: " << errno;
// ERROR_LOG(m_logger) << "Error setting TCP_KEEPIDLE: " << errno;
// }
// const int keepIntervalCnt = 10; // sec
// if (setsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPINTVL, &keepIntervalCnt, sizeof(keepIntervalCnt)) != 0)
// {
// ERROR_LOG() << "Error setting TCP_KEEPINTVL: " << errno;
// ERROR_LOG(m_logger) << "Error setting TCP_KEEPINTVL: " << errno;
// }
// const int idlePaketCnt = 2; // 2 probes -> detection shoud be comes after 5s + 2 * 10s => 25 sec
// if (setsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPCNT, &idlePaketCnt, sizeof(idlePaketCnt)) != 0)
// {
// ERROR_LOG() << "Error setting TCP_KEEPCNT: " << errno;
// ERROR_LOG(m_logger) << "Error setting TCP_KEEPCNT: " << errno;
// }
// //----- Testausgaben
// int getOption = 0;
// socklen_t optlen = sizeof(getOption);
// getsockopt(m_socket->socketDescriptor(), SOL_SOCKET, SO_KEEPALIVE, &getOption, &optlen);
// ERROR_LOG() << "...SO_KEEPALIVE set to: " << getOption;
// ERROR_LOG(m_logger) << "...SO_KEEPALIVE set to: " << getOption;
// getsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPIDLE, &getOption, &optlen);
// ERROR_LOG() << "...TCP_KEEPIDLE set to: " << getOption;
// ERROR_LOG(m_logger) << "...TCP_KEEPIDLE set to: " << getOption;
// getsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPINTVL, &getOption, &optlen);
// ERROR_LOG() << "...TCP_KEEPINTVL set to: " << getOption;
// ERROR_LOG(m_logger) << "...TCP_KEEPINTVL set to: " << getOption;
// getsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPCNT, &getOption, &optlen);
// ERROR_LOG() << "...TCP_KEEPCNT set to: " << getOption;
// ERROR_LOG(m_logger) << "...TCP_KEEPCNT set to: " << getOption;
init(); // pure virtual function
// Auspraegung mit spezieller Sensorinitialisierung durchfuehren
@@ -143,14 +143,14 @@ void TcpSocket::onConnected()
void TcpSocket::onDisonnected()
{
INFO_LOG() << "Disconnected from " << m_socket->peerAddress().toString()
INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
<< ":" << m_socket->peerPort();
}
//-------------------------------------------------------------------
void TcpSocket::onError(QAbstractSocket::SocketError err)
{
ERROR_LOG() << "Socket error: " << err
ERROR_LOG(m_logger) << "Socket error: " << err
<< " \"" << m_socket->errorString() << "\""
<< " Hostname: " << m_hostName
<< " Serial Port:" << m_hostPort
@@ -178,7 +178,7 @@ void TcpSocket::onReadyRead()
while (m_socket->canReadLine())
{
const QByteArray line = m_socket->readLine();
DEBUG_LOG() << "Read line from sensor: " << line;
DEBUG_LOG(m_logger) << "Read line from sensor: " << line;
dataAvailable(line); // pure virtual function
// Auspraegung mit spezieller Sensordatenauswertung durchfuehren
@@ -190,14 +190,14 @@ bool TcpSocket::sendCommand(const QByteArray &qba)
{
bool bOk = true;
INFO_LOG() << "Send command: " << qba;
INFO_LOG(m_logger) << "Send command: " << qba;
if (m_socket->state() != QTcpSocket::ConnectedState)
{
if (m_bSocketErrorWarnedOnce)
{
m_bSocketErrorWarnedOnce = true;
WARNING_LOG() << "Error on sendCommand(). No socket connection estabilished."
WARNING_LOG(m_logger) << "Error on sendCommand(). No socket connection estabilished."
<< " Hostname: " << m_hostName;
}
return false;
@@ -208,7 +208,7 @@ bool TcpSocket::sendCommand(const QByteArray &qba)
if (trxBytes != qba.size())
{
bOk = false;
ERROR_LOG() << "Insufficient number of tansfered bytes."
ERROR_LOG(m_logger) << "Insufficient number of tansfered bytes."
<< " Soll: " << trxBytes << " Ist: " << qba.size();
}
m_socket->flush();