Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -10,18 +10,18 @@ namespace DifferentialGPS
|
||||
DdsHandler::DdsHandler(int domainId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global))
|
||||
{
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
INFO_LOG() << "--- Start DifferentialGPS DDSHandler.";
|
||||
INFO_LOG(m_logger) << "--- Start DifferentialGPS DDSHandler.";
|
||||
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
};
|
||||
|
||||
@@ -59,7 +59,7 @@ bool MainThread::init(int domainId)
|
||||
m_ddsHandler.reset(new DdsHandler(domainId));
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ public:
|
||||
Q_SIGNALS:
|
||||
void newDataAvailable();
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
QByteArray m_dgpsData;
|
||||
QTimer *m_dgpsTimer;
|
||||
|
||||
@@ -33,7 +33,7 @@ void TcpSocket::startThreadInternal(const QString &hostName, quint16 port)
|
||||
|
||||
void TcpSocket::run()
|
||||
{
|
||||
DEBUG_LOG() << "Starting thread";
|
||||
DEBUG_LOG(m_logger) << "Starting thread";
|
||||
m_reconnectTimer = new QTimer(this);
|
||||
doConnect();
|
||||
exec();
|
||||
@@ -54,14 +54,14 @@ void TcpSocket::doConnect()
|
||||
connect(m_socket, &QTcpSocket::readyRead,
|
||||
this, &TcpSocket::onReadyRead);
|
||||
|
||||
INFO_LOG() << "Connecting to tcp server at "
|
||||
INFO_LOG(m_logger) << "Connecting to tcp server at "
|
||||
<< m_hostName << ":" << m_hostPort;
|
||||
m_socket->connectToHost(m_hostName, m_hostPort);
|
||||
}
|
||||
|
||||
void TcpSocket::onConnected()
|
||||
{
|
||||
INFO_LOG() << "Connected to "
|
||||
INFO_LOG(m_logger) << "Connected to "
|
||||
<< m_socket->peerAddress().toString()
|
||||
<< ":" << m_socket->peerPort();
|
||||
m_waitTime = 1;
|
||||
@@ -69,13 +69,13 @@ void TcpSocket::onConnected()
|
||||
|
||||
void TcpSocket::onDisconnected()
|
||||
{
|
||||
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()
|
||||
<< ":" << m_socket->peerPort()
|
||||
<< " - trying to reconnect in " << m_waitTime << " seconds";
|
||||
|
||||
@@ -19,6 +19,7 @@ public:
|
||||
~TcpSocket();
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void startThreadInternal(const QString &hostName, quint16 port);
|
||||
|
||||
void run() override;
|
||||
@@ -33,6 +34,7 @@ protected Q_SLOTS:
|
||||
virtual void onError(QAbstractSocket::SocketError);
|
||||
virtual void onReadyRead() = 0;
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QString m_hostName;
|
||||
quint16 m_hostPort;
|
||||
QTcpSocket *m_socket;
|
||||
|
||||
Reference in new issue
Block a user