add InitMessage() to noui and use debug.log for GUI
- this pull adds an InitMessage() function to noui.cpp, which outputs init messages to debug.log (this allows to remove some printf() calls from init.cpp) - change InitMessage() in bitcoin.cpp to also write init messages to debug.log to ensure nothting is missing in the log because of the removal of printf() calls in init.cpp
This commit is contained in:
parent
e0c8fbac35
commit
bb41a87d57
3 changed files with 10 additions and 4 deletions
|
@ -742,7 +742,7 @@ bool AppInit2()
|
|||
nCoinCacheSize = nTotalCache / 300; // coins in memory require around 300 bytes
|
||||
|
||||
uiInterface.InitMessage(_("Loading block index..."));
|
||||
printf("Loading block index...\n");
|
||||
|
||||
nStart = GetTimeMillis();
|
||||
pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
|
||||
pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex);
|
||||
|
@ -799,7 +799,7 @@ bool AppInit2()
|
|||
// ********************************************************* Step 8: load wallet
|
||||
|
||||
uiInterface.InitMessage(_("Loading wallet..."));
|
||||
printf("Loading wallet...\n");
|
||||
|
||||
nStart = GetTimeMillis();
|
||||
bool fFirstRun = true;
|
||||
pwalletMain = new CWallet("wallet.dat");
|
||||
|
@ -897,7 +897,7 @@ bool AppInit2()
|
|||
// ********************************************************* Step 10: load peers
|
||||
|
||||
uiInterface.InitMessage(_("Loading addresses..."));
|
||||
printf("Loading addresses...\n");
|
||||
|
||||
nStart = GetTimeMillis();
|
||||
|
||||
{
|
||||
|
@ -932,7 +932,6 @@ bool AppInit2()
|
|||
// ********************************************************* Step 12: finished
|
||||
|
||||
uiInterface.InitMessage(_("Done loading"));
|
||||
printf("Done loading\n");
|
||||
|
||||
if (!strErrors.str().empty())
|
||||
return InitError(strErrors.str());
|
||||
|
|
|
@ -37,9 +37,15 @@ static bool noui_ThreadSafeAskFee(int64 /*nFeeRequired*/)
|
|||
return true;
|
||||
}
|
||||
|
||||
static void noui_InitMessage(const std::string &message)
|
||||
{
|
||||
printf("init message: %s\n", message.c_str());
|
||||
}
|
||||
|
||||
void noui_connect()
|
||||
{
|
||||
// Connect bitcoind signal handlers
|
||||
uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox);
|
||||
uiInterface.ThreadSafeAskFee.connect(noui_ThreadSafeAskFee);
|
||||
uiInterface.InitMessage.connect(noui_InitMessage);
|
||||
}
|
||||
|
|
|
@ -86,6 +86,7 @@ static void InitMessage(const std::string &message)
|
|||
splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(255,255,200));
|
||||
QApplication::instance()->processEvents();
|
||||
}
|
||||
printf("init message: %s\n", message.c_str());
|
||||
}
|
||||
|
||||
static void QueueShutdown()
|
||||
|
|
Loading…
Reference in a new issue