Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+15
-15
@@ -61,10 +61,10 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
if (handleVersion(version))
|
||||
{
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_SUP_SECURITY_TYPES);
|
||||
DEBUG_LOG() << "RfbVersion handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbVersion handled Successfully!";
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "RfbVersion handshake Error!";
|
||||
ERROR_LOG(m_logger) << "RfbVersion handshake Error!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -78,10 +78,10 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
if (handleSupportedSecurityTypes(supTypes))
|
||||
{
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_VNC_AUTHENTICATION);
|
||||
DEBUG_LOG() << "RfbSecurityType handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbSecurityType handled Successfully!";
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "RfbSecurityType handshake Error!";
|
||||
ERROR_LOG(m_logger) << "RfbSecurityType handshake Error!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -95,10 +95,10 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
if (handleVncAuthentication(auth))
|
||||
{
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_SECURITY_RESULT);
|
||||
DEBUG_LOG() << "RfbVncAuthentication handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbVncAuthentication handled Successfully!";
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "RfbVncAuthentication Error!";
|
||||
ERROR_LOG(m_logger) << "RfbVncAuthentication Error!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -112,10 +112,10 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
if (handleSecurityResult(result))
|
||||
{
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_SERVER_INIT);
|
||||
DEBUG_LOG() << "RfbSecurityResult handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbSecurityResult handled Successfully!";
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "RfbSecurityResult Error!";
|
||||
ERROR_LOG(m_logger) << "RfbSecurityResult Error!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
emit connected();
|
||||
m_socket->write(RfbProtocol::CTS::RfbFrameBufferUpdateRequest(false, 0, 0, 1920, 1200));
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_FRAMEBUFFER_UPDATE);
|
||||
DEBUG_LOG() << "RfbServerInit handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbServerInit handled Successfully!";
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -155,7 +155,7 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
stream.startTransaction();
|
||||
quint8 msgType;
|
||||
stream >> msgType;
|
||||
DEBUG_LOG() << "got message from server: " << QString::number(msgType, 16);
|
||||
DEBUG_LOG(m_logger) << "got message from server: " << QString::number(msgType, 16);
|
||||
switch (msgType)
|
||||
{
|
||||
case RfbProtocol::STC::RFB_FRAMEBUFFER_UPDATE:
|
||||
@@ -167,7 +167,7 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
case RfbProtocol::STC::RFB_SERVER_CUTTEXT:
|
||||
return handleServerCuttext(stream);
|
||||
default:
|
||||
WARNING_LOG() << "Unknown message type from server (" << QString::number(msgType, 16) << ") - reconnecting";
|
||||
WARNING_LOG(m_logger) << "Unknown message type from server (" << QString::number(msgType, 16) << ") - reconnecting";
|
||||
stream.abortTransaction();
|
||||
slotOnDisconnected();
|
||||
return false;
|
||||
@@ -241,7 +241,7 @@ void VncHandler::writeData(const QByteArray &data)
|
||||
|
||||
void VncHandler::error()
|
||||
{
|
||||
ERROR_LOG() << "SocketError " << m_socket->errorString();
|
||||
ERROR_LOG(m_logger) << "SocketError " << m_socket->errorString();
|
||||
}
|
||||
|
||||
void VncHandler::resetHandler()
|
||||
@@ -261,7 +261,7 @@ bool VncHandler::handleVersion(const RfbProtocol::STC::RfbVersion &version)
|
||||
version.minorVersion()));
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "Unsupported Version: " << version.majorVersion() << "." << version.minorVersion();
|
||||
ERROR_LOG(m_logger) << "Unsupported Version: " << version.majorVersion() << "." << version.minorVersion();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -276,7 +276,7 @@ bool VncHandler::handleSupportedSecurityTypes(const RfbProtocol::STC::RfbSupport
|
||||
for (quint8 type : supportedTypes.types())
|
||||
typesString.append(QString::number(type)).append(QLatin1Char(' '));
|
||||
if (typesString.isEmpty()) typesString = QStringLiteral("EMPTY");
|
||||
ERROR_LOG() << "Unsupported Security Types: " << typesString;
|
||||
ERROR_LOG(m_logger) << "Unsupported Security Types: " << typesString;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -327,7 +327,7 @@ bool VncHandler::handleSecurityResult(const RfbProtocol::STC::RfbSecurityResult
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG() << result.reason();
|
||||
ERROR_LOG(m_logger) << result.reason();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
+2
@@ -39,6 +39,8 @@ private slots:
|
||||
void error();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool handleData(QDataStream &stream);
|
||||
bool handleFrameBufferUpdate(QDataStream &stream);
|
||||
bool handleSetColormap(QDataStream &stream);
|
||||
|
||||
+19
-19
@@ -137,7 +137,7 @@ bool ControlDialog::init(LtsSession::LtsSession *session,
|
||||
if (info.addresses().size() > 0)
|
||||
m_host = info.addresses().at(0);
|
||||
else
|
||||
ERROR_LOG() << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
|
||||
ERROR_LOG(m_logger) << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -160,7 +160,7 @@ void ControlDialog::aboutToClose()
|
||||
|
||||
void ControlDialog::slotOnConnectClicked()
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
|
||||
if (!m_isConnected)
|
||||
{
|
||||
initWebSocketHandler();
|
||||
@@ -178,9 +178,9 @@ void ControlDialog::slotOnConnectClicked()
|
||||
m_webSocketClient->webSocket()->close();
|
||||
}
|
||||
}
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " connect clicked, this=" << this;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " connect clicked, this=" << this;
|
||||
updateConnectButton();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
|
||||
}
|
||||
|
||||
void ControlDialog::slotOnLogoutClicked()
|
||||
@@ -190,7 +190,7 @@ void ControlDialog::slotOnLogoutClicked()
|
||||
m_webSocketClient->addReply((new LtsProjectionWorkstation::CTS::LogoutRequest(QUuid::createUuid().toString()))->toReplyMessage());
|
||||
m_webSocketClient->webSocket()->close();
|
||||
}
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " logout clicked, this=" << this;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " logout clicked, this=" << this;
|
||||
updateConnectButton();
|
||||
}
|
||||
|
||||
@@ -210,7 +210,7 @@ void ControlDialog::slotOnWebSocketConnected()
|
||||
if (workspaceIdToUse.isEmpty())
|
||||
{
|
||||
workspaceIdToUse = QUuid::createUuid().toString();
|
||||
INFO_LOG() << "workspaceIdToUse " << workspaceIdToUse;
|
||||
INFO_LOG(m_logger) << "workspaceIdToUse " << workspaceIdToUse;
|
||||
}
|
||||
m_opmIfc->callWorkspaceSaveUnsaved(workspaceIdToUse);
|
||||
LtsUtils::OperatorSettings* opSettings = LtsUtils::OperatorSettings::getInstance();
|
||||
@@ -229,7 +229,7 @@ void ControlDialog::slotOnWebSocketConnected()
|
||||
|
||||
|
||||
|
||||
INFO_LOG() << " connect userId=" << userId
|
||||
INFO_LOG(m_logger) << " connect userId=" << userId
|
||||
<< ", with prio=" << user.projectionPriority()
|
||||
<< ", PwsWorkspace/Id='" << workspaceIdToUse << "'";
|
||||
|
||||
@@ -244,7 +244,7 @@ void ControlDialog::slotOnWebSocketConnected()
|
||||
|
||||
void ControlDialog::slotOnVncDisconnected()
|
||||
{
|
||||
INFO_LOG() << " slotOnVncDisconnected";
|
||||
INFO_LOG(m_logger) << " slotOnVncDisconnected";
|
||||
|
||||
if (m_webSocketClient)
|
||||
{
|
||||
@@ -255,7 +255,7 @@ void ControlDialog::slotOnVncDisconnected()
|
||||
if (!m_ui || !m_ui->pbnConnect)
|
||||
return;
|
||||
m_ui->pbnConnect->setEnabled(true);
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " VNC disconnected, this=" << this;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " VNC disconnected, this=" << this;
|
||||
updateConnectButton();
|
||||
}
|
||||
|
||||
@@ -267,18 +267,18 @@ void ControlDialog::slotOnWebSocketDisconnected()
|
||||
m_isConnected = false;
|
||||
if (m_ui && m_ui->pbnConnect)
|
||||
m_ui->pbnConnect->setEnabled(true);
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " WEBSOCKET disconnected, this=" << this;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " WEBSOCKET disconnected, this=" << this;
|
||||
updateConnectButton();
|
||||
}
|
||||
|
||||
|
||||
void ControlDialog::slotOnWebSocketError()
|
||||
{
|
||||
ERROR_LOG() << m_webSocketClient->webSocket()->errorString();
|
||||
ERROR_LOG(m_logger) << m_webSocketClient->webSocket()->errorString();
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, m_webSocketClient->webSocket()->errorString(), tr("Connection to the presentation workstation failed!"));
|
||||
m_isConnected = false;
|
||||
m_ui->pbnConnect->setEnabled(true);
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " VWEBSOCKET ERROR, this=" << this;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " VWEBSOCKET ERROR, this=" << this;
|
||||
updateConnectButton();
|
||||
}
|
||||
|
||||
@@ -299,7 +299,7 @@ void ControlDialog::slotCbxWorkstationsChanged()
|
||||
if (info.addresses().size() > 0)
|
||||
m_host = info.addresses().at(0);
|
||||
else
|
||||
ERROR_LOG() << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
|
||||
ERROR_LOG(m_logger) << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
|
||||
}
|
||||
|
||||
|
||||
@@ -324,14 +324,14 @@ void ControlDialog::fillCombobox()
|
||||
|
||||
void ControlDialog::updateConnectButton()
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this
|
||||
<< ", m_isConnected=" << m_isConnected
|
||||
<< ", pbnConnect->text()=" << m_ui->pbnConnect->text();
|
||||
if (!m_ui)
|
||||
return;
|
||||
m_ui->pbnConnect->setText(m_isConnected ? tr("Disonnect") : tr("Connect"));
|
||||
m_ui->pbnLogout->setEnabled(m_isConnected);
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this
|
||||
<< ", m_isConnected=" << m_isConnected
|
||||
<< ", pbnConnect->text()=" << m_ui->pbnConnect->text();
|
||||
}
|
||||
@@ -358,7 +358,7 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
|
||||
LtsWidgets::LayoutArea::eDialogTab, false, false);
|
||||
}
|
||||
}
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " LoginSuccessful YES, this=" << this;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " LoginSuccessful YES, this=" << this;
|
||||
m_isConnected = true;
|
||||
m_ui->pbnConnect->setEnabled(true);
|
||||
updateConnectButton();
|
||||
@@ -377,7 +377,7 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
|
||||
}
|
||||
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, errMsg, tr("Login failed!"));
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " LoginSuccessful NO, this=" << this;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " LoginSuccessful NO, this=" << this;
|
||||
m_isConnected = false;
|
||||
m_ui->pbnConnect->setEnabled(true);
|
||||
updateConnectButton();
|
||||
@@ -388,13 +388,13 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
|
||||
LtsProjectionWorkstation::STC::DedicatedDisconnect *disconnect = dynamic_cast<LtsProjectionWorkstation::STC::DedicatedDisconnect *>(message);
|
||||
if (disconnect)
|
||||
{
|
||||
INFO_LOG() << " DedicatedDisconnect.. "
|
||||
INFO_LOG(m_logger) << " DedicatedDisconnect.. "
|
||||
<< ", getOperatorId=" << LtsSessionData::LtsSessionData::getInstance()->getOperatorId()
|
||||
<< ", disconnect->userid()=" << disconnect->userid();
|
||||
if ( (disconnect->userid() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId()) && m_isConnected)
|
||||
{
|
||||
slotOnWebSocketDisconnected();
|
||||
INFO_LOG() << " DedicatedDisconnect.. done";
|
||||
INFO_LOG(m_logger) << " DedicatedDisconnect.. done";
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ bool OperatorSettingsLoader::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (!session->getFtc<OperatorManagement::DataInterface>(m_opmFtc))
|
||||
{
|
||||
ERROR_LOG() << "Failed to load OperatorManagement FTC!";
|
||||
ERROR_LOG(m_logger) << "Failed to load OperatorManagement FTC!";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
+2
@@ -29,6 +29,8 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool loadOperatorRights();
|
||||
|
||||
LtsProjectionWorkstation::
|
||||
|
||||
+3
-3
@@ -72,7 +72,7 @@ void VncViewerDialog::retranslate()
|
||||
|
||||
void VncViewerDialog::handleServerCuttext(const QString &cutText)
|
||||
{
|
||||
DEBUG_LOG() << "Got cuttext: " << cutText;
|
||||
DEBUG_LOG(m_logger) << "Got cuttext: " << cutText;
|
||||
}
|
||||
|
||||
void VncViewerDialog::slotOnDisconnected()
|
||||
@@ -240,7 +240,7 @@ void VncRenderAreaWorker::onRfbFrameBufferUpdate(const QVector<RfbProtocol::RfbR
|
||||
{
|
||||
if (rect.pixelData.isEmpty())
|
||||
{
|
||||
WARNING_LOG() << "No valid vnc pixel data... skipping frame";
|
||||
WARNING_LOG(m_logger) << "No valid vnc pixel data... skipping frame";
|
||||
continue;
|
||||
}
|
||||
QImage img(reinterpret_cast<const unsigned char *>(rect.pixelData.data()),
|
||||
@@ -249,7 +249,7 @@ void VncRenderAreaWorker::onRfbFrameBufferUpdate(const QVector<RfbProtocol::RfbR
|
||||
QImage::Format_RGB32);
|
||||
if (img.isNull())
|
||||
{
|
||||
WARNING_LOG() << "Could not decode image data... skipping vnc frame";
|
||||
WARNING_LOG(m_logger) << "Could not decode image data... skipping vnc frame";
|
||||
continue;
|
||||
}
|
||||
painter.drawImage(QPoint(rect.xpos, rect.ypos), img);
|
||||
|
||||
+1
@@ -34,6 +34,7 @@ Q_SIGNALS:
|
||||
void newImageAvailable();
|
||||
void newScaleSizeAspectRatio(QSize s);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QImage m_renderedImage;
|
||||
QImage m_scaledImage;
|
||||
mutable QMutex m_mutex;
|
||||
|
||||
Reference in new issue
Block a user