Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+2
-3
@@ -127,9 +127,8 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle
|
||||
// ####### ClientMessage end #######
|
||||
|
||||
// ####### ServicesInformation begin #######
|
||||
ErrorMessage::ErrorMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data)
|
||||
: ClientMessage(dataManager, client, type, typeId, uuid, data)
|
||||
{}
|
||||
ErrorMessage::ErrorMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
void ErrorMessage::process()
|
||||
{
|
||||
|
||||
+7
-7
@@ -27,13 +27,13 @@ DataManager::DataManager(MainHandler *mainHandler)
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::handleErrorMessage(const OcBaseDownload::WebSocketInterface::Messages::ErrorMessage::ErrorData &errData)
|
||||
{
|
||||
ERROR_LOG() << "uuid: " << errData.uuid << " error class: " << errData.errorClass << " text: " << errData.errorMessage;
|
||||
ERROR_LOG(m_logger) << "uuid: " << errData.uuid << " error class: " << errData.errorClass << " text: " << errData.errorMessage;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsInformation::ExerciseInformation> &exerciseInformation)
|
||||
{
|
||||
DEBUG_LOG() << "Got ServicePortsInformation from websocket";
|
||||
DEBUG_LOG(m_logger) << "Got ServicePortsInformation from websocket";
|
||||
switch (m_currentDownload)
|
||||
{
|
||||
case CurrentDownload::PDF:
|
||||
@@ -44,7 +44,7 @@ void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsIn
|
||||
break;
|
||||
case CurrentDownload::NOTHING:
|
||||
default:
|
||||
WARNING_LOG() << "Got Ports Information in neither BASE nor PDF download mode";
|
||||
WARNING_LOG(m_logger) << "Got Ports Information in neither BASE nor PDF download mode";
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,7 @@ void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsIn
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::handlePdfListMessage(const Messages::PdfListMessage::PdfListData &pdfListData)
|
||||
{
|
||||
DEBUG_LOG() << "Got PDF list from websocket";
|
||||
DEBUG_LOG(m_logger) << "Got PDF list from websocket";
|
||||
m_mainHandler->handlerPdfDownload()->handlePdfListData(pdfListData);
|
||||
}
|
||||
|
||||
@@ -64,19 +64,19 @@ void DataManager::setCurrentDownload(CurrentDownload currentDownload)
|
||||
switch (m_currentDownload)
|
||||
{
|
||||
case CurrentDownload::PDF:
|
||||
DEBUG_LOG() << "Setting current download mode to PDF";
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to PDF";
|
||||
m_mainHandler->dds()->fts()->enableStartBaseDownload(false);
|
||||
m_mainHandler->dds()->fts()->enableGetPdfList();
|
||||
m_mainHandler->dds()->fts()->enableStartPdfDownload();
|
||||
break;
|
||||
case CurrentDownload::BASE:
|
||||
DEBUG_LOG() << "Setting current download mode to BASE";
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to BASE";
|
||||
m_mainHandler->dds()->fts()->enableStartBaseDownload();
|
||||
m_mainHandler->dds()->fts()->enableGetPdfList(false);
|
||||
m_mainHandler->dds()->fts()->enableStartPdfDownload(false);
|
||||
break;
|
||||
case CurrentDownload::NOTHING:
|
||||
DEBUG_LOG() << "Setting current download mode to NOTHING";
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to NOTHING";
|
||||
m_mainHandler->dds()->fts()->enableAll();
|
||||
break;
|
||||
default:
|
||||
|
||||
+5
-5
@@ -43,9 +43,9 @@ bool WebSocketInterfaceHandler::init()
|
||||
{
|
||||
cleanup();
|
||||
|
||||
DEBUG_LOG() << "WebSocketInterfaceHandler::init";
|
||||
DEBUG_LOG(m_logger) << "WebSocketInterfaceHandler::init";
|
||||
m_dataManager = new DataManager(m_mainHandler);
|
||||
DEBUG_LOG() << "... ok";
|
||||
DEBUG_LOG(m_logger) << "... ok";
|
||||
|
||||
m_messageFactory = new Messages::ClientMessageFactory(m_dataManager);
|
||||
|
||||
@@ -55,7 +55,7 @@ bool WebSocketInterfaceHandler::init()
|
||||
void WebSocketInterfaceHandler::open(const QString &hostname, int port)
|
||||
{
|
||||
|
||||
DEBUG_LOG() << "Opening " << hostname << ":" << port;
|
||||
DEBUG_LOG(m_logger) << "Opening " << hostname << ":" << port;
|
||||
|
||||
recreateWebSocket();
|
||||
|
||||
@@ -79,7 +79,7 @@ void WebSocketInterfaceHandler::close()
|
||||
bool WebSocketInterfaceHandler::send(LtsWebSocket::ReplyMessage *message)
|
||||
{
|
||||
|
||||
DEBUG_LOG() << "Sending: " << message->toJsonString();
|
||||
DEBUG_LOG(m_logger) << "Sending: " << message->toJsonString();
|
||||
|
||||
if (!m_webSocketClient)
|
||||
return false;
|
||||
@@ -112,7 +112,7 @@ void WebSocketInterfaceHandler::recreateWebSocket()
|
||||
connect(m_webSocketClient, &LtsWebSocket::LtsWebSocketClient::dataReceived,
|
||||
this, [this]()
|
||||
{
|
||||
DEBUG_LOG() << "data received restart timer";
|
||||
DEBUG_LOG(m_logger) << "data received restart timer";
|
||||
m_webSocketActivityTimer->start();
|
||||
});
|
||||
|
||||
|
||||
Reference in new issue
Block a user