Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meaningful error on wrong channel name

Browse Source
This commit is contained in:
Alexey Rybalchenko 2016-05-20 12:54:10 +02:00
parent a05dc80402
commit 4944d7ec41
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fairmq/FairMQDevice.cxx
View File

@ -16,6 +16,7 @@
#include <algorithm> // std::sort() #include <algorithm> // std::sort()
#include <csignal> // catching system signals #include <csignal> // catching system signals
#include <cstdlib> #include <cstdlib>
#include <stdexcept>
#include <termios.h> // for the InteractiveStateLoop #include <termios.h> // for the InteractiveStateLoop
#include <poll.h> #include <poll.h>
@ -439,14 +440,23 @@ void FairMQDevice::RunWrapper()
boost::thread rateLogger(boost::bind(&FairMQDevice::LogSocketRates, this)); boost::thread rateLogger(boost::bind(&FairMQDevice::LogSocketRates, this));
Run(); try
{
Run();
}
catch (const out_of_range& oor)
{
LOG(ERROR) << "Out of Range error: " << oor.what();
LOG(ERROR) << "Incorrect channel name in the Run() or the configuration?";
ChangeState(ERROR);
}
try try
{ {
rateLogger.interrupt(); rateLogger.interrupt();
rateLogger.join(); rateLogger.join();
} }
catch(boost::thread_resource_error& e) catch (const boost::thread_resource_error& e)
{ {
LOG(ERROR) << e.what(); LOG(ERROR) << e.what();
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -476,7 +486,7 @@ void FairMQDevice::Pause()
boost::this_thread::sleep(boost::posix_time::milliseconds(500)); boost::this_thread::sleep(boost::posix_time::milliseconds(500));
LOG(DEBUG) << "paused..."; LOG(DEBUG) << "paused...";
} }
catch (boost::thread_interrupted&) catch (const boost::thread_interrupted&)
{ {
LOG(INFO) << "FairMQDevice::Pause() interrupted"; LOG(INFO) << "FairMQDevice::Pause() interrupted";
break; break;