From 411b05ac9511395923976bfbd0c153ddabf2ebcf Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 8 Oct 2015 09:58:31 +0200
Subject: Refactor parameter interaction, call it before AppInit2()

---
 src/bitcoind.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/bitcoind.cpp')

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index addf0e6a2..f1875731d 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -151,6 +151,7 @@ bool AppInit(int argc, char* argv[])
 #endif
         SoftSetBoolArg("-server", true);
 
+        InitParameterInteraction();
         fRet = AppInit2(threadGroup, scheduler);
     }
     catch (const std::exception& e) {
-- 
cgit v1.2.3


From a46f87f0c17323d8853d95f8ea99f8fb0f3bda1a Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Thu, 26 Nov 2015 14:03:27 +0100
Subject: Initialize logging before we do parameter interaction

---
 src/bitcoind.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/bitcoind.cpp')

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index f1875731d..4cee2d3cf 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -151,6 +151,8 @@ bool AppInit(int argc, char* argv[])
 #endif
         SoftSetBoolArg("-server", true);
 
+        // Set this early so that parameter interactions go to console
+        InitLogging();
         InitParameterInteraction();
         fRet = AppInit2(threadGroup, scheduler);
     }
-- 
cgit v1.2.3