generate id if no device id available

* CreateSocket factory no longer accepts id param, but the
    TransportFactory has an id member instead
This commit is contained in:
Dennis Klein
2017-05-16 18:26:24 +02:00
committed by Mohammad Al-Turany
parent eb614b6005
commit 3be2f297f3
10 changed files with 101 additions and 91 deletions

View File

@@ -76,7 +76,7 @@ FairMQChannel::FairMQChannel(const string& type, const string& method, const str
}
FairMQChannel::FairMQChannel(const string& name, const string& type, std::shared_ptr<FairMQTransportFactory> factory)
: fSocket(factory->CreateSocket(type, name, name)) // TODO whats id and whats name?
: fSocket(factory->CreateSocket(type, name))
, fType(type)
, fMethod("unspecified")
, fAddress("unspecified")
@@ -665,7 +665,7 @@ void FairMQChannel::InitTransport(shared_ptr<FairMQTransportFactory> factory)
bool FairMQChannel::InitCommandInterface()
{
fChannelCmdSocket = fTransportFactory->CreateSocket("sub", "device-commands", "internal");
fChannelCmdSocket = fTransportFactory->CreateSocket("sub", "device-commands");
if (fChannelCmdSocket)
{
fChannelCmdSocket->Connect("inproc://commands");