Remove -logtodebugger
`-logtodebugger` is a strange, obscure, WIN32-only (mostly MSVC) thing. Let's clean up the options a bit get rid of it. test_bitcoin was using fLogToDebugger as a way to prevent logging to debug.log. For this, add a boolean (not exposed as option) fLogToDebugLog that defaults to true and is disabled in the tests.
This commit is contained in:
parent
8a7606f35b
commit
9e9056cd1a
4 changed files with 4 additions and 32 deletions
|
@ -245,10 +245,6 @@ std::string HelpMessage(HelpMessageMode hmm)
|
||||||
strUsage += " -printtoconsole " + _("Send trace/debug info to console instead of debug.log file") + "\n";
|
strUsage += " -printtoconsole " + _("Send trace/debug info to console instead of debug.log file") + "\n";
|
||||||
strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be "
|
strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be "
|
||||||
"solved instantly. This is intended for regression testing tools and app development.") + "\n";
|
"solved instantly. This is intended for regression testing tools and app development.") + "\n";
|
||||||
#ifdef WIN32
|
|
||||||
strUsage += " -printtodebugger " + _("Send trace/debug info to debugger") + "\n";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (hmm == HMM_BITCOIN_QT)
|
if (hmm == HMM_BITCOIN_QT)
|
||||||
{
|
{
|
||||||
strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\n";
|
strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\n";
|
||||||
|
@ -492,7 +488,6 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer)
|
||||||
fServer = GetBoolArg("-server", false);
|
fServer = GetBoolArg("-server", false);
|
||||||
|
|
||||||
fPrintToConsole = GetBoolArg("-printtoconsole", false);
|
fPrintToConsole = GetBoolArg("-printtoconsole", false);
|
||||||
fPrintToDebugger = GetBoolArg("-printtodebugger", false);
|
|
||||||
fLogTimestamps = GetBoolArg("-logtimestamps", true);
|
fLogTimestamps = GetBoolArg("-logtimestamps", true);
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
bool fDisableWallet = GetBoolArg("-disablewallet", false);
|
bool fDisableWallet = GetBoolArg("-disablewallet", false);
|
||||||
|
|
|
@ -26,7 +26,7 @@ struct TestingSetup {
|
||||||
boost::thread_group threadGroup;
|
boost::thread_group threadGroup;
|
||||||
|
|
||||||
TestingSetup() {
|
TestingSetup() {
|
||||||
fPrintToDebugger = true; // don't want to write to debug.log file
|
fPrintToDebugLog = false; // don't want to write to debug.log file
|
||||||
noui_connect();
|
noui_connect();
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
bitdb.MakeMock();
|
bitdb.MakeMock();
|
||||||
|
|
27
src/util.cpp
27
src/util.cpp
|
@ -88,7 +88,7 @@ map<string, string> mapArgs;
|
||||||
map<string, vector<string> > mapMultiArgs;
|
map<string, vector<string> > mapMultiArgs;
|
||||||
bool fDebug = false;
|
bool fDebug = false;
|
||||||
bool fPrintToConsole = false;
|
bool fPrintToConsole = false;
|
||||||
bool fPrintToDebugger = false;
|
bool fPrintToDebugLog = true;
|
||||||
bool fDaemon = false;
|
bool fDaemon = false;
|
||||||
bool fServer = false;
|
bool fServer = false;
|
||||||
string strMiscWarning;
|
string strMiscWarning;
|
||||||
|
@ -270,7 +270,7 @@ int LogPrint(const char* category, const char* pszFormat, ...)
|
||||||
ret += vprintf(pszFormat, arg_ptr);
|
ret += vprintf(pszFormat, arg_ptr);
|
||||||
va_end(arg_ptr);
|
va_end(arg_ptr);
|
||||||
}
|
}
|
||||||
else if (!fPrintToDebugger)
|
else if (fPrintToDebugLog)
|
||||||
{
|
{
|
||||||
static bool fStartedNewLine = true;
|
static bool fStartedNewLine = true;
|
||||||
boost::call_once(&DebugPrintInit, debugPrintInitFlag);
|
boost::call_once(&DebugPrintInit, debugPrintInitFlag);
|
||||||
|
@ -302,29 +302,6 @@ int LogPrint(const char* category, const char* pszFormat, ...)
|
||||||
va_end(arg_ptr);
|
va_end(arg_ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
if (fPrintToDebugger)
|
|
||||||
{
|
|
||||||
// accumulate and output a line at a time
|
|
||||||
static std::string buffer;
|
|
||||||
|
|
||||||
boost::mutex::scoped_lock scoped_lock(*mutexDebugLog);
|
|
||||||
|
|
||||||
va_list arg_ptr;
|
|
||||||
va_start(arg_ptr, pszFormat);
|
|
||||||
buffer += vstrprintf(pszFormat, arg_ptr);
|
|
||||||
va_end(arg_ptr);
|
|
||||||
|
|
||||||
int line_start = 0, line_end;
|
|
||||||
while((line_end = buffer.find('\n', line_start)) != -1)
|
|
||||||
{
|
|
||||||
OutputDebugStringA(buffer.substr(line_start, line_end - line_start).c_str());
|
|
||||||
line_start = line_end + 1;
|
|
||||||
ret += line_end-line_start;
|
|
||||||
}
|
|
||||||
buffer.erase(0, line_start);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,7 @@ extern std::map<std::string, std::string> mapArgs;
|
||||||
extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
|
extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
|
||||||
extern bool fDebug;
|
extern bool fDebug;
|
||||||
extern bool fPrintToConsole;
|
extern bool fPrintToConsole;
|
||||||
extern bool fPrintToDebugger;
|
extern bool fPrintToDebugLog;
|
||||||
extern bool fDaemon;
|
extern bool fDaemon;
|
||||||
extern bool fServer;
|
extern bool fServer;
|
||||||
extern std::string strMiscWarning;
|
extern std::string strMiscWarning;
|
||||||
|
|
Loading…
Add table
Reference in a new issue