Initialize logging before we do parameter interaction

jonasschnelli · jonasschnelli · commit a46f87f0c173 · 2015-11-27T13:26:28.000+01:00
diff --git 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);
     }
diff --git a/src/init.cpp b/src/init.cpp
@@ -755,6 +755,17 @@ void InitParameterInteraction()
     }
 }
 
+void InitLogging()
+{
+    fPrintToConsole = GetBoolArg("-printtoconsole", false);
+    fLogTimestamps = GetBoolArg("-logtimestamps", true);
+    fLogTimeMicros = GetBoolArg("-logtimemicros", DEFAULT_LOGTIMEMICROS);
+    fLogIPs = GetBoolArg("-logips", false);
+
+    LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    LogPrintf("Bitcoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
+}
+
 /** Initialize bitcoin.
  *  @pre Parameters should be parsed and config file should be read.
  */
@@ -819,14 +830,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // ********************************************************* Step 2: parameter interactions
     const CChainParams& chainparams = Params();
 
-    // Set this early so that parameter interactions go to console
-    fPrintToConsole = GetBoolArg("-printtoconsole", false);
-    fLogTimestamps = GetBoolArg("-logtimestamps", true);
-    fLogTimeMicros = GetBoolArg("-logtimemicros", DEFAULT_LOGTIMEMICROS);
-    fLogIPs = GetBoolArg("-logips", false);
 
-    LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
-    LogPrintf("Bitcoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
 
     // if using block pruning, then disable txindex
     if (GetArg("-prune", 0)) {
diff --git a/src/init.h b/src/init.h
@@ -23,6 +23,8 @@ bool ShutdownRequested();
 /** Interrupt threads */
 void Interrupt(boost::thread_group& threadGroup);
 void Shutdown();
+//!Initialize the logging infrastructure
+void InitLogging();
 //!Parameter interaction: change current parameters depending on various rules
 void InitParameterInteraction();
 bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler);
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -401,6 +401,7 @@ void BitcoinApplication::startThread()
 
 void BitcoinApplication::parameterSetup()
 {
+    InitLogging();
     InitParameterInteraction();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,8 @@ bool AppInit(int argc, char* argv[])`
`151`	`151`	`#endif`
`152`	`152`	`SoftSetBoolArg("-server", true);`
`153`	`153`
	`154`	`+ // Set this early so that parameter interactions go to console`
	`155`	`+ InitLogging();`
`154`	`156`	`InitParameterInteraction();`
`155`	`157`	`fRet = AppInit2(threadGroup, scheduler);`
`156`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,7 @@ void BitcoinApplication::startThread()`
`401`	`401`
`402`	`402`	`void BitcoinApplication::parameterSetup()`
`403`	`403`	`{`
	`404`	`+ InitLogging();`
`404`	`405`	`InitParameterInteraction();`
`405`	`406`	`}`
`406`	`407`