Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+15
-16
@@ -17,16 +17,15 @@
|
||||
namespace VideoOverlayManagement
|
||||
{
|
||||
|
||||
AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent)
|
||||
: QObject(parent)
|
||||
AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent) : QObject(parent)
|
||||
, m_waitTime(1)
|
||||
, m_enableTryReconnect(enableTryReconnect)
|
||||
, m_tryReconnect(false)
|
||||
, m_avsKeepAliveTimer(new QTimer(this))
|
||||
, m_keepAliveTime(Settings::getAvsKeepAliveTime())
|
||||
, m_avsIfConnectionState(AvsIfConnectionState::Undefined)
|
||||
, m_socket(nullptr)
|
||||
{
|
||||
, m_socket(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
doConnect();
|
||||
|
||||
connect(m_avsKeepAliveTimer, &QTimer::timeout,
|
||||
@@ -45,7 +44,7 @@ AvsInterface::~AvsInterface()
|
||||
|
||||
void AvsInterface::doConnect()
|
||||
{
|
||||
DEBUG_LOG() << "doConnect TCP-Socket ";
|
||||
DEBUG_LOG(m_logger) << "doConnect TCP-Socket ";
|
||||
|
||||
if (m_socket)
|
||||
m_socket->deleteLater();
|
||||
@@ -62,7 +61,7 @@ void AvsInterface::doConnect()
|
||||
|
||||
if (m_tryReconnect)
|
||||
{
|
||||
INFO_LOG() << "Try reconnect to host: " << m_hostName
|
||||
INFO_LOG(m_logger) << "Try reconnect to host: " << m_hostName
|
||||
<< " port: " << m_hostPort
|
||||
<< " ip-address: " << m_ipAddressDNS;
|
||||
|
||||
@@ -78,12 +77,12 @@ void AvsInterface::start(const QString &hostName, quint16 port)
|
||||
const QList<QHostAddress> ipList = hostInfo.addresses();
|
||||
if (ipList.isEmpty())
|
||||
{
|
||||
ERROR_LOG() << "Non ip-address found for hostname: " << hostName;
|
||||
ERROR_LOG(m_logger) << "Non ip-address found for hostname: " << hostName;
|
||||
m_ipAddressDNS.clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG() << "Try connect to AVS: " << hostName
|
||||
INFO_LOG(m_logger) << "Try connect to AVS: " << hostName
|
||||
<< " port: " << port
|
||||
<< " ip-address: " << ipList.at(0).toString();
|
||||
|
||||
@@ -97,7 +96,7 @@ void AvsInterface::start(const QString &hostName, quint16 port)
|
||||
|
||||
void AvsInterface::onConnected()
|
||||
{
|
||||
INFO_LOG() << "Connected to "
|
||||
INFO_LOG(m_logger) << "Connected to "
|
||||
<< m_socket->peerAddress().toString()
|
||||
<< ":" << m_socket->peerPort();
|
||||
m_waitTime = 1;
|
||||
@@ -112,7 +111,7 @@ void AvsInterface::onConnected()
|
||||
|
||||
void AvsInterface::onDisonnected()
|
||||
{
|
||||
INFO_LOG() << "Disconnected from " << m_socket->peerAddress().toString()
|
||||
INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
|
||||
<< ":" << m_socket->peerPort();
|
||||
|
||||
m_avsKeepAliveTimer->stop();
|
||||
@@ -125,7 +124,7 @@ void AvsInterface::onError(QAbstractSocket::SocketError err)
|
||||
{
|
||||
if (m_enableTryReconnect)
|
||||
{
|
||||
ERROR_LOG() << "Socket error: " << err
|
||||
ERROR_LOG(m_logger) << "Socket error: " << err
|
||||
<< " \"" << m_socket->errorString() << "\""
|
||||
<< " Hostname: " << m_hostName
|
||||
<< " Port:" << m_hostPort
|
||||
@@ -134,7 +133,7 @@ void AvsInterface::onError(QAbstractSocket::SocketError err)
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG() << "Socket error: " << err
|
||||
ERROR_LOG(m_logger) << "Socket error: " << err
|
||||
<< " \"" << m_socket->errorString() << "\""
|
||||
<< " Hostname: " << m_hostName
|
||||
<< " Port:" << m_hostPort
|
||||
@@ -179,7 +178,7 @@ void AvsInterface::onReadyRead()
|
||||
if (data.isEmpty())
|
||||
continue;
|
||||
|
||||
INFO_LOG() << "Incoming RCP_AVA: '" << data << "'";
|
||||
INFO_LOG(m_logger) << "Incoming RCP_AVA: '" << data << "'";
|
||||
int cmdNr = -1;
|
||||
bool bOk = false;
|
||||
|
||||
@@ -236,11 +235,11 @@ bool AvsInterface::sendCommand(const QByteArray &qba)
|
||||
{
|
||||
bool bOk = true;
|
||||
|
||||
INFO_LOG() << "Send command: " << qba.trimmed();
|
||||
INFO_LOG(m_logger) << "Send command: " << qba.trimmed();
|
||||
|
||||
if (m_socket->state() != QTcpSocket::ConnectedState)
|
||||
{
|
||||
ERROR_LOG() << "sendCommand()"
|
||||
ERROR_LOG(m_logger) << "sendCommand()"
|
||||
<< " '" << qba.trimmed()
|
||||
<< "' No socket connection established.";
|
||||
return false;
|
||||
@@ -251,7 +250,7 @@ bool AvsInterface::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();
|
||||
|
||||
@@ -99,6 +99,8 @@ protected Q_SLOTS:
|
||||
void onAvsKeepAliveTimeout();
|
||||
|
||||
private: // methode
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void tryReconnect();
|
||||
|
||||
private: // attributes
|
||||
|
||||
@@ -16,17 +16,17 @@ namespace VideoOverlayManagement
|
||||
DdsHandler::DdsHandler(int domainId, int exerciseId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
|
||||
{
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
INFO_LOG() << "--- Start VideoOverlayManagement DDSHandler.";
|
||||
INFO_LOG(m_logger) << "--- Start VideoOverlayManagement DDSHandler.";
|
||||
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
};
|
||||
|
||||
+15
-16
@@ -13,11 +13,10 @@
|
||||
|
||||
using namespace VideoOverlayManagement;
|
||||
|
||||
HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent)
|
||||
: QObject(parent)
|
||||
HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_exerciseId(0)
|
||||
{
|
||||
, m_exerciseId(0),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -33,7 +32,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
m_dtc = InfrastructureManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
if (m_dtc == nullptr)
|
||||
{
|
||||
ERROR_LOG() << "Could not create DTC InfrastructureManagement";
|
||||
ERROR_LOG(m_logger) << "Could not create DTC InfrastructureManagement";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -44,7 +43,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
!m_dtc->waitForHistoricalDataMountingPointAsset() ||
|
||||
!m_dtc->waitForHistoricalDataInstrumentationAsset())
|
||||
{
|
||||
ERROR_LOG() << "init() DTC InfrastructureManagement failed";
|
||||
ERROR_LOG(m_logger) << "init() DTC InfrastructureManagement failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -58,7 +57,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
};
|
||||
if (!m_dtc->getAllAssetsPerRoom(predicate, assetsMap))
|
||||
{
|
||||
WARNING_LOG() << "HandlerInfrastructureData::getAllAssetsPerRoom() failed"
|
||||
WARNING_LOG(m_logger) << "HandlerInfrastructureData::getAllAssetsPerRoom() failed"
|
||||
<< " assetsMap.size(): " << assetsMap.size();
|
||||
}
|
||||
|
||||
@@ -71,7 +70,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
asset.availableInExercise().end(), m_exerciseId);
|
||||
if (it == asset.availableInExercise().end())
|
||||
{
|
||||
DEBUG_LOG() << "Asset " << asset.id()
|
||||
DEBUG_LOG(m_logger) << "Asset " << asset.id()
|
||||
<< " is not available in current exercise - skipping";
|
||||
continue;
|
||||
}
|
||||
@@ -79,16 +78,16 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
m_roomId2CameraNameMap.insert(roomId, QString::fromStdString(asset.name()));
|
||||
// und fuer subscribe in m_assetId2RoomIdMap eintragen
|
||||
m_assetId2RoomIdMap.insert(asset.id(), roomId);
|
||||
DEBUG_LOG() << " assetId: " << asset.id()
|
||||
DEBUG_LOG(m_logger) << " assetId: " << asset.id()
|
||||
<< " mountingPointTypeId: " << asset.mountingPointTypeId()
|
||||
<< " name: " << asset.name();
|
||||
}
|
||||
} // for(auto i = assetMap...
|
||||
|
||||
INFO_LOG() << "m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
|
||||
INFO_LOG(m_logger) << "m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
|
||||
for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
|
||||
{
|
||||
INFO_LOG() << "roomId: " << i.key()
|
||||
INFO_LOG(m_logger) << "roomId: " << i.key()
|
||||
<< " cameraName: " << i.value();
|
||||
}
|
||||
|
||||
@@ -100,7 +99,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
m_dtc->enableMainStructureElement(false);
|
||||
m_dtc->enableMountingPointAsset(false);
|
||||
|
||||
INFO_LOG() << "HandlerInfrastructureData::init() finished. "
|
||||
INFO_LOG(m_logger) << "HandlerInfrastructureData::init() finished. "
|
||||
<< " m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -116,7 +115,7 @@ QString HandlerInfrastructureData::getStreamNameFromRoomId(int roomId) const
|
||||
{
|
||||
auto it = m_roomId2CameraNameMap.find(roomId);
|
||||
const QString qs(it == m_roomId2CameraNameMap.end() ? QString() : it.value());
|
||||
DEBUG_LOG() << "streamName for roomId: " << roomId << " '" << qs << "' ";
|
||||
DEBUG_LOG(m_logger) << "streamName for roomId: " << roomId << " '" << qs << "' ";
|
||||
|
||||
return qs;
|
||||
} // end of getStreamNameFromRoomId()
|
||||
@@ -128,7 +127,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
|
||||
if (data.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera)
|
||||
return;
|
||||
|
||||
INFO_LOG() << "onAssetChanged()"
|
||||
INFO_LOG(m_logger) << "onAssetChanged()"
|
||||
<< " assetId: " << data.id()
|
||||
<< " name: " << data.name();
|
||||
|
||||
@@ -136,7 +135,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
|
||||
data.availableInExercise().end(), m_exerciseId);
|
||||
if (it == data.availableInExercise().end())
|
||||
{
|
||||
DEBUG_LOG() << "Asset " << data.id()
|
||||
DEBUG_LOG(m_logger) << "Asset " << data.id()
|
||||
<< " is not available in current exercise - skipping";
|
||||
return;
|
||||
}
|
||||
@@ -146,7 +145,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
|
||||
|
||||
for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
|
||||
{
|
||||
DEBUG_LOG() << "m_roomId2CameraNameMap changed... "
|
||||
DEBUG_LOG(m_logger) << "m_roomId2CameraNameMap changed... "
|
||||
<< " m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size()
|
||||
<< " roomId: " << i.key()
|
||||
<< " cameraName: " << *i;
|
||||
|
||||
+2
@@ -56,6 +56,8 @@ private Q_SLOTS:
|
||||
void onAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType);
|
||||
|
||||
private: // methoden
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
/**
|
||||
* Returns the room id for the given assetId
|
||||
* @param[in] assetId Id of the asset to get the room id for
|
||||
|
||||
+14
-15
@@ -19,13 +19,12 @@ HandlerOverlays::HandlerOverlays(AvsInterface *avsIf,
|
||||
const std::shared_ptr<HandlerParticipantData> &handlerParticipantData,
|
||||
const std::shared_ptr<HandlerInfrastructureData> &handlerInfrastructureData,
|
||||
int exerciseId,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_avsIf(avsIf)
|
||||
, m_handlerParticipantData(handlerParticipantData)
|
||||
, m_handlerInfrastructureData(handlerInfrastructureData)
|
||||
, m_exerciseId(exerciseId)
|
||||
{
|
||||
, m_exerciseId(exerciseId),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -36,7 +35,7 @@ HandlerOverlays::~HandlerOverlays()
|
||||
|
||||
bool HandlerOverlays::init()
|
||||
{
|
||||
INFO_LOG() << "Start VideoOverlay Handler.";
|
||||
INFO_LOG(m_logger) << "Start VideoOverlay Handler.";
|
||||
|
||||
// internal Signal/Slot connection (must be done before calling initParticipantsInRoomMap() !)
|
||||
connect(this, &HandlerOverlays::participantsInRoomMapChanged,
|
||||
@@ -48,7 +47,7 @@ bool HandlerOverlays::init()
|
||||
connect(m_handlerParticipantData.get(), &HandlerParticipantData::participantPositionChanged,
|
||||
this, &HandlerOverlays::onParticipantPositionChanged);
|
||||
|
||||
INFO_LOG() << "VOM Handler initialized. ";
|
||||
INFO_LOG(m_logger) << "VOM Handler initialized. ";
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -56,7 +55,7 @@ bool HandlerOverlays::init()
|
||||
|
||||
void HandlerOverlays::onParticipantPositionChanged(int oldRoomId, int newRoomId, int participantId)
|
||||
{
|
||||
DEBUG_LOG() << "onParticipantPositionChanged() "
|
||||
DEBUG_LOG(m_logger) << "onParticipantPositionChanged() "
|
||||
<< " oldRoomId: " << oldRoomId
|
||||
<< " newRoomId: " << newRoomId
|
||||
<< " participantId: " << participantId
|
||||
@@ -72,7 +71,7 @@ void HandlerOverlays::onParticipantPositionChanged(int oldRoomId, int newRoomId,
|
||||
|
||||
void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int> &participants)
|
||||
{
|
||||
DEBUG_LOG() << "onParticipantsInRoomMapChanged() "
|
||||
DEBUG_LOG(m_logger) << "onParticipantsInRoomMapChanged() "
|
||||
<< " roomId: " << roomId
|
||||
<< " partId: " << getAllEquipmentNumbers(participants, false)
|
||||
<< " eqNo: " << getAllEquipmentNumbers(participants, true)
|
||||
@@ -81,7 +80,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
|
||||
|
||||
if (!m_handlerInfrastructureData->isCameraAvailable(roomId))
|
||||
{
|
||||
WARNING_LOG() << "onParticipantsInRoomMapChanged() Non camera available in roomId: " << roomId << " No data will be send to AVS.";
|
||||
WARNING_LOG(m_logger) << "onParticipantsInRoomMapChanged() Non camera available in roomId: " << roomId << " No data will be send to AVS.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -93,7 +92,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
|
||||
|
||||
if (streamName.isEmpty())
|
||||
{
|
||||
ERROR_LOG() << "onParticipantsInRoomMapChanged() No streamName found for roomId: " << roomId << " No data will be send to AVS.";
|
||||
ERROR_LOG(m_logger) << "onParticipantsInRoomMapChanged() No streamName found for roomId: " << roomId << " No data will be send to AVS.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -116,7 +115,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
|
||||
QByteArray qba = cmd.toLatin1();
|
||||
qba += "\r\n";
|
||||
|
||||
INFO_LOG() << "onParticipantsInRoomMapChanged() sendCommand: " << qba ;
|
||||
INFO_LOG(m_logger) << "onParticipantsInRoomMapChanged() sendCommand: " << qba ;
|
||||
m_avsIf->sendCommand(qba);
|
||||
|
||||
// room entry der keine participants enthaelt loeschen
|
||||
@@ -137,7 +136,7 @@ void HandlerOverlays::initParticipantsInRoomMap()
|
||||
|
||||
void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participantId)
|
||||
{
|
||||
DEBUG_LOG() << "addPartIdToParticipantsInRoomMap() "
|
||||
DEBUG_LOG(m_logger) << "addPartIdToParticipantsInRoomMap() "
|
||||
<< " roomId: " << roomId
|
||||
<< " participantId: " << participantId
|
||||
;
|
||||
@@ -154,7 +153,7 @@ void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participa
|
||||
m_participantsInRoomMap.insert(roomId, participants);
|
||||
|
||||
///
|
||||
DEBUG_LOG() << "emit participantsInRoomMapChanged()"
|
||||
DEBUG_LOG(m_logger) << "emit participantsInRoomMapChanged()"
|
||||
<< " roomId: " << roomId
|
||||
<< " partId: " << getAllEquipmentNumbers(participants, false)
|
||||
<< " eqNo: " << getAllEquipmentNumbers(participants, true)
|
||||
@@ -167,7 +166,7 @@ void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participa
|
||||
|
||||
void HandlerOverlays::removePartIdFromParticipantsInRoomMap(int roomId, int participantId)
|
||||
{
|
||||
DEBUG_LOG() << "removePartIdFromParticipantsInRoomMap() "
|
||||
DEBUG_LOG(m_logger) << "removePartIdFromParticipantsInRoomMap() "
|
||||
<< " roomId: " << roomId
|
||||
<< " participantId: " << participantId
|
||||
;
|
||||
@@ -181,7 +180,7 @@ void HandlerOverlays::removePartIdFromParticipantsInRoomMap(int roomId, int part
|
||||
participants.remove(participantId);
|
||||
m_participantsInRoomMap.insert(roomId, participants);
|
||||
|
||||
DEBUG_LOG() << "emit participantsInRoomMapChanged()"
|
||||
DEBUG_LOG(m_logger) << "emit participantsInRoomMapChanged()"
|
||||
<< " roomId: " << roomId
|
||||
<< " partId: " << getAllEquipmentNumbers(participants, false)
|
||||
<< " eqNo: " << getAllEquipmentNumbers(participants, true)
|
||||
|
||||
@@ -62,6 +62,8 @@ private Q_SLOTS:
|
||||
void onParticipantsInRoomMapChanged(int roomId, const QSet<int> &participants);
|
||||
|
||||
private: // methodes
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
/**
|
||||
* Initialize 'participantsInRoomMap'
|
||||
*/
|
||||
|
||||
+9
-10
@@ -13,10 +13,9 @@
|
||||
|
||||
using namespace VideoOverlayManagement;
|
||||
|
||||
HandlerParticipantData::HandlerParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
{
|
||||
HandlerParticipantData::HandlerParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
|
||||
, m_ddsHandler(ddsHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -31,14 +30,14 @@ bool HandlerParticipantData::init()
|
||||
m_dtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
if (m_dtc == nullptr)
|
||||
{
|
||||
ERROR_LOG() << "Could not create DTC ParticipantManagement";
|
||||
ERROR_LOG(m_logger) << "Could not create DTC ParticipantManagement";
|
||||
return false;
|
||||
}
|
||||
|
||||
// only subscribe to the topics we're interested in
|
||||
if (!m_dtc->enableParticipant() || !m_dtc->enableParticipantPosition())
|
||||
{
|
||||
ERROR_LOG() << "init() DTC ParticipantManagement failed";
|
||||
ERROR_LOG(m_logger) << "init() DTC ParticipantManagement failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -60,7 +59,7 @@ bool HandlerParticipantData::init()
|
||||
};
|
||||
m_dtc->participantPositions(cbParticipantPos);
|
||||
|
||||
INFO_LOG() << "HandlerParticipantData::init() finished. "
|
||||
INFO_LOG(m_logger) << "HandlerParticipantData::init() finished. "
|
||||
<< " m_partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
|
||||
<< " m_participantsPositionMap.size(): " << m_participantsPositionMap.size();
|
||||
return true;
|
||||
@@ -87,7 +86,7 @@ QMap<int, int> HandlerParticipantData::getAllAssignedParticipants() const
|
||||
|
||||
void HandlerParticipantData::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
|
||||
{
|
||||
INFO_LOG() << "onParticipantChanged() participantId:" << data.id();
|
||||
INFO_LOG(m_logger) << "onParticipantChanged() participantId:" << data.id();
|
||||
|
||||
if (modType != DataModification::eRemoved && data.equipmentNumber().is_set())
|
||||
m_partId2EquipNoMap.insert(data.id(), data.equipmentNumber().get());
|
||||
@@ -97,7 +96,7 @@ void HandlerParticipantData::onParticipantChanged(const ParticipantManagement::P
|
||||
if (m_logger.isDebugEnabled())
|
||||
{
|
||||
for (auto i = m_partId2EquipNoMap.begin(); i != m_partId2EquipNoMap.end(); ++i)
|
||||
DEBUG_LOG() << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
|
||||
DEBUG_LOG(m_logger) << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
|
||||
<< " partId: " << i.key()
|
||||
<< " eqNo: " << i.value();
|
||||
}
|
||||
@@ -116,7 +115,7 @@ void HandlerParticipantData::onParticipantPositionChanged(const ParticipantManag
|
||||
if (newRoomId != oldRoomId)
|
||||
emit participantPositionChanged(oldRoomId, newRoomId, data.participantId());
|
||||
|
||||
INFO_LOG() << "onParticipantPositionChanged()"
|
||||
INFO_LOG(m_logger) << "onParticipantPositionChanged()"
|
||||
<< " oldRoomId: " << oldRoomId
|
||||
<< " newRoomId: " << newRoomId
|
||||
<< " participantId: " << data.participantId();
|
||||
|
||||
+2
@@ -60,6 +60,8 @@ private Q_SLOTS:
|
||||
|
||||
private: // methoden
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
private: // attributes
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler; ///< Pointer to VOM DDS handler
|
||||
|
||||
|
||||
+20
-21
@@ -15,8 +15,7 @@
|
||||
|
||||
using namespace VideoOverlayManagement;
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
MainHandler::MainHandler(QObject *parent) : QObject(parent)
|
||||
, m_exerciseId(0)
|
||||
, m_avsIf(new AvsInterface(true, this))
|
||||
, m_avsConnectionState(AvsIfConnectionState::Undefined)
|
||||
@@ -26,8 +25,8 @@ MainHandler::MainHandler(QObject *parent)
|
||||
, m_handlerOverlays(nullptr)
|
||||
, m_checkConnectTimer(new QTimer(this))
|
||||
, m_keepAliveTriggerTimer(new QTimer(this))
|
||||
, m_bAvsSocketWarnedOnce(false)
|
||||
{
|
||||
, m_bAvsSocketWarnedOnce(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -39,14 +38,14 @@ MainHandler::~MainHandler()
|
||||
|
||||
bool MainHandler::init(int domainId, int exerciseId)
|
||||
{
|
||||
INFO_LOG() << "Start VideoOverlayManagement MainHandler.";
|
||||
INFO_LOG(m_logger) << "Start VideoOverlayManagement MainHandler.";
|
||||
|
||||
m_exerciseId = exerciseId;
|
||||
|
||||
// init AVS-Interface
|
||||
QString hostName = Settings::getAvsHostname();
|
||||
quint16 port = Settings::getAvsAvaPort();
|
||||
INFO_LOG() << "Init AVS-Interface Hostname/Ip:" << hostName
|
||||
INFO_LOG(m_logger) << "Init AVS-Interface Hostname/Ip:" << hostName
|
||||
<< " Port: " << port;
|
||||
|
||||
m_avsIf->start(hostName, port);
|
||||
@@ -68,7 +67,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
m_ddsHandler.reset(new DdsHandler(domainId, exerciseId));
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
if (m_ddsHandler->pacemaker())
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
@@ -79,7 +78,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
|
||||
if (!m_handlerParticipantData->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation HandlerPlayerData failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerPlayerData failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
@@ -89,7 +88,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
|
||||
if (!m_handlerInfrastructureData->init(m_exerciseId))
|
||||
{
|
||||
ERROR_LOG() << "Initialisation HandlerInfrastructreData failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerInfrastructreData failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
@@ -99,7 +98,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
this, &MainHandler::onTryToInitOverlayHandler);
|
||||
m_checkConnectTimer->start(1000);
|
||||
|
||||
INFO_LOG() << "VOM Handler initialized. (Connection to AVS may be still pending) ";
|
||||
INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS may be still pending) ";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
|
||||
|
||||
return true;
|
||||
@@ -114,7 +113,7 @@ bool MainHandler::onTryToInitOverlayHandler()
|
||||
if (!m_bAvsSocketWarnedOnce)
|
||||
{
|
||||
m_bAvsSocketWarnedOnce = true;
|
||||
WARNING_LOG() << "MainHandler::onTryToInitOverlayHandler()"
|
||||
WARNING_LOG(m_logger) << "MainHandler::onTryToInitOverlayHandler()"
|
||||
<< " Wait for AvsIfConnectionState::Connected... ";
|
||||
}
|
||||
return false;
|
||||
@@ -128,12 +127,12 @@ bool MainHandler::onTryToInitOverlayHandler()
|
||||
|
||||
if (!m_handlerOverlays->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation HandlerOverlays failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerOverlays failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
|
||||
return false;
|
||||
}
|
||||
|
||||
INFO_LOG() << "VOM Handler initialized. (Connection to AVS established) ";
|
||||
INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS established) ";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
|
||||
return true;
|
||||
@@ -145,7 +144,7 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
|
||||
switch (state)
|
||||
{
|
||||
case AvsIfConnectionState::Connected:
|
||||
INFO_LOG() << "AvsIfConnectionState::Connected ... start keepAliveTriggerTimer";
|
||||
INFO_LOG(m_logger) << "AvsIfConnectionState::Connected ... start keepAliveTriggerTimer";
|
||||
m_keepAliveTriggerTimer->start(Settings::getAvsKeepAliveTriggerRequestTime());
|
||||
break;
|
||||
case AvsIfConnectionState::Disconnected:
|
||||
@@ -155,13 +154,13 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
|
||||
m_keepAliveTriggerTimer->stop();
|
||||
break;
|
||||
case AvsIfConnectionState::ConnectionError:
|
||||
ERROR_LOG() << "AvsIfConnectionState::ConnectionError !";
|
||||
ERROR_LOG(m_logger) << "AvsIfConnectionState::ConnectionError !";
|
||||
m_keepAliveTriggerTimer->stop();
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
|
||||
break;
|
||||
case AvsIfConnectionState::Undefined:
|
||||
default:
|
||||
WARNING_LOG() << "Undefined AvsIfConnectionState !";
|
||||
WARNING_LOG(m_logger) << "Undefined AvsIfConnectionState !";
|
||||
break;
|
||||
}
|
||||
} // end of onAvsIfConnectionState()
|
||||
@@ -173,17 +172,17 @@ void MainHandler::onAvsCmdState(AvsCmdState state)
|
||||
switch (state)
|
||||
{
|
||||
case AvsCmdState::Ok:
|
||||
INFO_LOG() << "AvsCmdState::Ok";
|
||||
INFO_LOG(m_logger) << "AvsCmdState::Ok";
|
||||
bOk = true;
|
||||
break;
|
||||
case AvsCmdState::BadArguments:
|
||||
WARNING_LOG() << "AvsCmdState::BadArguments";
|
||||
WARNING_LOG(m_logger) << "AvsCmdState::BadArguments";
|
||||
break;
|
||||
case AvsCmdState::CommandNotStateValid:
|
||||
WARNING_LOG() << "AvsCmdState::CommandNotStateValid";
|
||||
WARNING_LOG(m_logger) << "AvsCmdState::CommandNotStateValid";
|
||||
break;
|
||||
case AvsCmdState::KeepAlive:
|
||||
DEBUG_LOG() << "AvsCmdState::KeepAlive";
|
||||
DEBUG_LOG(m_logger) << "AvsCmdState::KeepAlive";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -199,7 +198,7 @@ void MainHandler::onAvsCmdState(AvsCmdState state)
|
||||
void MainHandler::onAvsKeepAliveTimeout()
|
||||
{
|
||||
// ToDo: Fehlermeldung an ServiceManagement senden
|
||||
WARNING_LOG() << "AVS KeepAlive timeout !";
|
||||
WARNING_LOG(m_logger) << "AVS KeepAlive timeout !";
|
||||
} // end of onAvsKeepAliveTimeout()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -51,6 +51,9 @@ private Q_SLOTS:
|
||||
|
||||
|
||||
private: // attributes
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_exerciseId; ///< Exercise id
|
||||
AvsInterface *m_avsIf; ///< Pointer to AVS-Interface
|
||||
AvsIfConnectionState m_avsConnectionState; ///< AVS connection state
|
||||
|
||||
Reference in new issue
Block a user