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

Merge channels from config to device, instead of replace

Browse Source
This commit is contained in:
Alexey Rybalchenko 2017-06-30 10:19:59 +02:00 committed by Mohammad Al-Turany
parent a26925cbf5
commit 6f18cf23da
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fairmq/FairMQDevice.cxx
View File

@ -968,7 +968,13 @@ void FairMQDevice::SetConfig(FairMQProgOptions& config)
{ {
fExternalConfig = true; fExternalConfig = true;
fConfig = &config; fConfig = &config;
fChannels = config.GetFairMQMap(); for (auto& c : config.GetFairMQMap())
{
if (!fChannels.insert(c).second)
{
LOG(WARN) << "FairMQDevice::SetConfig: did not insert channel '" << c.first << "', it is already in the device.";
}
}
fDefaultTransport = config.GetValue<string>("transport"); fDefaultTransport = config.GetValue<string>("transport");
SetTransport(fDefaultTransport); SetTransport(fDefaultTransport);
fId = config.GetValue<string>("id"); fId = config.GetValue<string>("id");