From 7e606441165c0b4780d876157b336ab092cbd84c Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 10 Mar 2018 22:46:19 +0100
Subject: Reorder some startup messages

---
 src/ConfigParser.cpp  | 1 -
 src/DabMod.cpp        | 9 ++++++++-
 src/RemoteControl.cpp | 1 -
 src/Utils.cpp         | 7 -------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index b593e61..3c75026 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -99,7 +99,6 @@ static void parse_configfile(
     if (pt.get("remotecontrol.zmqctrl", 0) == 1) {
         try {
             std::string zmqCtrlEndpoint = pt.get("remotecontrol.zmqctrlendpoint", "");
-            std::cerr << "ZmqCtrlEndpoint: " << zmqCtrlEndpoint << std::endl;
             auto zmqrc = make_shared<RemoteControllerZmq>(zmqCtrlEndpoint);
             rcs.add_controller(zmqrc);
         }
diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index b32231a..e68202e 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -254,10 +254,17 @@ int launch_modulator(int argc, char* argv[])
         throw runtime_error("Could not set signal handler: " + errstr);
     }
 
+    printStartupInfo();
+
     mod_settings_t mod_settings;
     parse_args(argc, argv, mod_settings);
 
-    printStartupInfo();
+    etiLog.level(info) << "Configuration parsed. Starting up version " <<
+#if defined(GITVERSION)
+            GITVERSION;
+#else
+            VERSION;
+#endif
 
     if (not (mod_settings.useFileOutput or
              mod_settings.useUHDOutput or
diff --git a/src/RemoteControl.cpp b/src/RemoteControl.cpp
index 0060075..a346386 100644
--- a/src/RemoteControl.cpp
+++ b/src/RemoteControl.cpp
@@ -388,7 +388,6 @@ void RemoteControllerZmq::send_fail_reply(zmq::socket_t &pSocket, const std::str
 void RemoteControllerZmq::process()
 {
     // create zmq reply socket for receiving ctrl parameters
-    etiLog.level(info) << "Starting zmq remote control thread";
     try {
         zmq::socket_t repSocket(m_zmqContext, ZMQ_REP);
 
diff --git a/src/Utils.cpp b/src/Utils.cpp
index dd63862..4d97359 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -147,13 +147,6 @@ void printVersion(void)
 void printStartupInfo()
 {
     printHeader();
-
-    etiLog.level(info) << "Starting up version " <<
-#if defined(GITVERSION)
-            GITVERSION;
-#else
-            VERSION;
-#endif
 }
 
 int set_realtime_prio(int prio)
-- 
cgit v1.2.3