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

@@ -33,10 +33,10 @@ WebSocketHandler::~WebSocketHandler()
bool WebSocketHandler::init(quint16 listenPort)
{
DEBUG_LOG() << "init";
DEBUG_LOG(m_logger) << "init";
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;
}
@@ -44,7 +44,7 @@ bool WebSocketHandler::init(quint16 listenPort)
this, &WebSocketHandler::onNewConnection);
INFO_LOG() << "Listening on port " << m_webSocketServer->serverPort();
INFO_LOG(m_logger) << "Listening on port " << m_webSocketServer->serverPort();
return true;
}
@@ -61,7 +61,7 @@ bool WebSocketHandler::init(const QPair<quint16, quint16> &portRange)
bool WebSocketHandler::sendTelegramInternal() const
{
DEBUG_LOG() << "sendTelegramInternal";
DEBUG_LOG(m_logger) << "sendTelegramInternal";
QJsonObject obj;
obj[QStringLiteral("participantId")] = 1;
obj[QStringLiteral("equipmentNumber")] = 2;
@@ -82,7 +82,7 @@ bool WebSocketHandler::sendTelegramInternal() const
bool WebSocketHandler::sendbuildingInfos() const
{
DEBUG_LOG() << "sendbuildingInfos";
DEBUG_LOG(m_logger) << "sendbuildingInfos";
QJsonObject obj;
QJsonArray arr;
@@ -93,7 +93,7 @@ bool WebSocketHandler::sendbuildingInfos() const
BuildingProcess* buildingProcess = i.value();
BuildingInfo buildingInfo = buildingProcess->buildingInfo();
quint16 port = buildingProcess->getWebsocketPort();
DEBUG_LOG() << "key=" << i.key()
DEBUG_LOG(m_logger) << "key=" << i.key()
<< " port= " << port
<< " buildingInfo.name=" << buildingInfo.name;
QJsonObject objIter;
@@ -119,8 +119,8 @@ bool WebSocketHandler::sendbuildingInfos() const
void WebSocketHandler::onNewMessage(const QString &message)
{
DEBUG_LOG() << "onNewMessage='" << message << "'";
DEBUG_LOG() << "m_buildingControlHandler->m_buildings.size()=" << m_buildingControlHandler->getBuildings().size();
DEBUG_LOG(m_logger) << "onNewMessage='" << message << "'";
DEBUG_LOG(m_logger) << "m_buildingControlHandler->m_buildings.size()=" << m_buildingControlHandler->getBuildings().size();
if (message.indexOf(QStringLiteral("buildingRequest")) > 0)
{
@@ -128,7 +128,7 @@ void WebSocketHandler::onNewMessage(const QString &message)
}
if (message.indexOf(QStringLiteral("triggerFlashlight")) > 0)
{
DEBUG_LOG() << "triggerFlashlight" ;
DEBUG_LOG(m_logger) << "triggerFlashlight" ;
triggerFlashlight(message);
}
}
@@ -148,12 +148,12 @@ QJsonObject WebSocketHandler::ObjectFromString(const QString& in)
}
else
{
WARNING_LOG() << "Document is not an object";
WARNING_LOG(m_logger) << "Document is not an object";
}
}
else
{
WARNING_LOG() << "Invalid JSON...\n" << in ;
WARNING_LOG(m_logger) << "Invalid JSON...\n" << in ;
}
return obj;
@@ -162,20 +162,20 @@ QJsonObject WebSocketHandler::ObjectFromString(const QString& in)
void WebSocketHandler::triggerFlashlight(const QString &message)
{
DEBUG_LOG() << "triggerFlashlight message=" << message;
DEBUG_LOG(m_logger) << "triggerFlashlight message=" << message;
QJsonObject obj = ObjectFromString(message);
QJsonObject dataObj = obj.value(QStringLiteral("data")).toObject();
int structureElementId = dataObj.value(QStringLiteral("structureElementId")).toInt();
QString hostnameBsm = dataObj.value(QStringLiteral("hostnameBsm")).toString();
DEBUG_LOG() << "hostnameBsm=" << hostnameBsm
DEBUG_LOG(m_logger) << "hostnameBsm=" << hostnameBsm
<< " structureElementId=" << structureElementId;
}
void WebSocketHandler::onNewConnection()
{
DEBUG_LOG() << "onNewConnection";
DEBUG_LOG(m_logger) << "onNewConnection";
QWebSocket *ws = m_webSocketServer->nextPendingConnection();
if (!ws)
@@ -188,12 +188,12 @@ void WebSocketHandler::onNewConnection()
m_webSockets += ws;
INFO_LOG() << "New websocket connected";
INFO_LOG(m_logger) << "New websocket connected";
}
void WebSocketHandler::onWebSocketDisconnected()
{
DEBUG_LOG() << "onWebSocketDisconnected";
DEBUG_LOG(m_logger) << "onWebSocketDisconnected";
QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
if (!ws)
return;
@@ -201,7 +201,7 @@ void WebSocketHandler::onWebSocketDisconnected()
m_webSockets.removeAll(ws);
ws->deleteLater();
INFO_LOG() << "A websocket disconnected";
INFO_LOG(m_logger) << "A websocket disconnected";
}
bool WebSocketHandler::sendPosition()