Initialize logging before we do parameter interaction
This commit is contained in:
parent
df66147613
commit
a46f87f0c1
@ -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);
|
||||
}
|
||||
|
18
src/init.cpp
18
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)) {
|
||||
|
@ -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);
|
||||
|
@ -401,6 +401,7 @@ void BitcoinApplication::startThread()
|
||||
|
||||
void BitcoinApplication::parameterSetup()
|
||||
{
|
||||
InitLogging();
|
||||
InitParameterInteraction();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user