detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 15:27:13 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-14 16:37:46 +01:00
parent 9639e480d9 8520492e4b
commit 40d2f66146
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -749,10 +749,10 @@ std::string slsDetector::checkOnline() {
//Need both control and stop socket to work!
auto client = sls::ClientSocket(false, detector_shm()->hostname, detector_shm()->controlPort);
auto stop = sls::ClientSocket(false, detector_shm()->hostname, detector_shm()->stopPort);
retval = detector_shm()->hostname;
detector_shm()->onlineFlag = ONLINE_FLAG;
} catch (...) {
//try catch should not be used for control but we should also not call this function
detector_shm()->onlineFlag = OFFLINE_FLAG;
retval = detector_shm()->hostname;
}
return retval;
}
@ -4052,8 +4052,10 @@ std::string slsDetector::checkReceiverOnline() {
std::string retval;
try {
auto receiver = sls::ClientSocket(true, detector_shm()->receiver_hostname, detector_shm()->receiverTCPPort);
retval = detector_shm()->receiver_hostname;
detector_shm()->receiverOnlineFlag = ONLINE_FLAG;
} catch (...) {
detector_shm()->receiverOnlineFlag = OFFLINE_FLAG;
retval = detector_shm()->receiver_hostname;
}
return retval;
}