Initialize logging before we do parameter interaction

# Conflicts: # src/init.cpp # src/init.h
PIVX-Project · Mar 4, 2020 · ed536a3 · ed536a3
1 parent f5674be
commit ed536a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -907,6 +907,16 @@ void InitParameterInteraction()
  }
 }
 
+void InitLogging()
+{
+ fPrintToConsole = GetBoolArg("-printtoconsole", false);
+ fLogTimestamps = GetBoolArg("-logtimestamps", true);
+ 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("PIVX version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
+}
+
 /** Initialize pivx.
  * @pre Parameters should be parsed and config file should be read.
  */
@@ -917,14 +927,6 @@ bool AppInit2()
  return false;
 
  // ********************************************************* Step 2: parameter interactions
- // Set this early so that parameter interactions go to console
- fPrintToConsole = GetBoolArg("-printtoconsole", false);
- fLogTimestamps = GetBoolArg("-logtimestamps", true);
- 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("PIVX version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
-
  if (mapArgs.count("-reservebalance")) {
  if (!ParseMoney(mapArgs["-reservebalance"], nReserveBalance)) {
  InitError(_("Invalid amount for -reservebalance=<amount>"));

diff --git a/src/init.h b/src/init.h
@@ -27,6 +27,8 @@ bool ShutdownRequested();
 void Interrupt();
 void Shutdown();
 void PrepareShutdown();
+//!Initialize the logging infrastructure
+void InitLogging();
 //!Parameter interaction: change current parameters depending on various rules
 void InitParameterInteraction();
 bool AppInit2();

diff --git a/src/pivxd.cpp b/src/pivxd.cpp
@@ -140,6 +140,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();
  } catch (const std::exception& e) {

diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp
@@ -415,6 +415,7 @@ void BitcoinApplication::startThread()
 
 void BitcoinApplication::parameterSetup()
 {
+ InitLogging();
  InitParameterInteraction();
 }