From 58754e03c75d967645a6feb73aaa8619fafe33f9 Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Thu, 28 Apr 2016 09:51:02 +0200
Subject: [PATCH] Make sure logger is used before configuring it.

---
 fairmq/options/FairMQParser.cxx      | 2 ++
 fairmq/options/FairMQProgOptions.cxx | 1 +
 2 files changed, 3 insertions(+)

diff --git a/fairmq/options/FairMQParser.cxx b/fairmq/options/FairMQParser.cxx
index e588140c..e4948acb 100644
--- a/fairmq/options/FairMQParser.cxx
+++ b/fairmq/options/FairMQParser.cxx
@@ -221,6 +221,7 @@ namespace helper
                     FairMQChannel commonChannel;
                     commonChannel.UpdateType(q.second.get<string>("type", commonChannel.GetType()));
                     commonChannel.UpdateMethod(q.second.get<string>("method", commonChannel.GetMethod()));
+                    commonChannel.UpdateAddress(q.second.get<string>("address", commonChannel.GetAddress()));
                     commonChannel.UpdateProperty(q.second.get<string>("property", commonChannel.GetProperty()));
                     commonChannel.UpdateSndBufSize(q.second.get<int>("sndBufSize", commonChannel.GetSndBufSize()));
                     commonChannel.UpdateRcvBufSize(q.second.get<int>("rcvBufSize", commonChannel.GetRcvBufSize()));
@@ -254,6 +255,7 @@ namespace helper
                     // try to get common properties to use for all subChannels
                     commonChannel.UpdateType(p.second.get<string>("type", commonChannel.GetType()));
                     commonChannel.UpdateMethod(p.second.get<string>("method", commonChannel.GetMethod()));
+                    commonChannel.UpdateAddress(p.second.get<string>("address", commonChannel.GetAddress()));
                     commonChannel.UpdateProperty(p.second.get<string>("property", commonChannel.GetProperty()));
                     commonChannel.UpdateSndBufSize(p.second.get<int>("sndBufSize", commonChannel.GetSndBufSize()));
                     commonChannel.UpdateRcvBufSize(p.second.get<int>("rcvBufSize", commonChannel.GetRcvBufSize()));
diff --git a/fairmq/options/FairMQProgOptions.cxx b/fairmq/options/FairMQProgOptions.cxx
index f838735e..315d2416 100644
--- a/fairmq/options/FairMQProgOptions.cxx
+++ b/fairmq/options/FairMQProgOptions.cxx
@@ -35,6 +35,7 @@ FairMQProgOptions::~FairMQProgOptions()
 
 int FairMQProgOptions::ParseAll(const int argc, char** argv, bool allowUnregistered)
 {
+    LOG(NOLOG) << "";
     // init description
     InitOptionDescription();
     // parse command line options