Skip to content

use separate <wallet>_debug.log with -wallet option #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
UdjinM6 wants to merge 8 commits into from
Closed

use separate <wallet>_debug.log with -wallet option #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1af1366
Revert 25a07f10 -- makefile.unix
deusstultus Dec 5, 2014
fd6c104
Merge pull request #56 from deusstultus/master
eduffield82 Dec 5, 2014
bdbbcaf
use separate <wallet>_debug.log with -wallet option
UdjinM6 Dec 6, 2014
c441987
use separate <wallet>_debug.log with -wallet option - fix comments
UdjinM6 Dec 6, 2014
bb0ca36
Merge branch 'master' of https://github.com/darkcoin/darkcoin
UdjinM6 Dec 6, 2014
6be18c6
only update last dseep time when signature is valid
Dec 6, 2014
cdd7cad
Merge branch 'master' of https://github.com/darkcoin/darkcoin
UdjinM6 Dec 6, 2014
54b2010
Merge branch 'master' of https://github.com/darkcoin/darkcoin
UdjinM6 Dec 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,8 @@ bool AppInit2(boost::thread_group& threadGroup)

//ignore masternodes below protocol version
nMasternodeMinProtocol = GetArg("-masternodeminprotocol", 0);
std::string strWalletFile = GetArg("-wallet", "wallet.dat");
//define wallet
strWalletFile = GetArg("-wallet", "wallet.dat");

// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log

Expand All @@ -701,6 +702,10 @@ bool AppInit2(boost::thread_group& threadGroup)
if (!lock.try_lock())
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. DarkCoin is probably already running."), strDataDir.c_str()));

//use <wallet>_debug.log with -wallet option
if(strWalletFile != "wallet.dat")
strDebugFile = boost::filesystem::basename(strWalletFile) + "_debug.log";

if (GetBoolArg("-shrinkdebugfile", !fDebug))
ShrinkDebugFile();
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
Expand Down
8 changes: 5 additions & 3 deletions src/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ map<string, vector<string> > mapMultiArgs;
bool fMasterNode = false;
string strMasterNodePrivKey = "";
string strMasterNodeAddr = "";
string strWalletFile = "wallet.dat";
string strDebugFile = "debug.log";
int nInstantXDepth = 1;
int nDarksendRounds = 2;
int nAnonymizeDarkcoinAmount = 1000;
Expand Down Expand Up @@ -250,7 +252,7 @@ static void DebugPrintInit()
assert(fileout == NULL);
assert(mutexDebugLog == NULL);

boost::filesystem::path pathDebug = GetDataDir() / "debug.log";
boost::filesystem::path pathDebug = GetDataDir() / strDebugFile;
fileout = fopen(pathDebug.string().c_str(), "a");
if (fileout) setbuf(fileout, NULL); // unbuffered

Expand Down Expand Up @@ -287,7 +289,7 @@ int LogPrint(const char* category, const char* pszFormat, ...)
// reopen the log file, if requested
if (fReopenDebugLog) {
fReopenDebugLog = false;
boost::filesystem::path pathDebug = GetDataDir() / "debug.log";
boost::filesystem::path pathDebug = GetDataDir() / strDebugFile;
if (freopen(pathDebug.string().c_str(),"a",fileout) != NULL)
setbuf(fileout, NULL); // unbuffered
}
Expand Down Expand Up @@ -1287,7 +1289,7 @@ void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length) {
void ShrinkDebugFile()
{
// Scroll debug.log if it's getting too big
boost::filesystem::path pathLog = GetDataDir() / "debug.log";
boost::filesystem::path pathLog = GetDataDir() / strDebugFile;
FILE* file = fopen(pathLog.string().c_str(), "r");
if (file && GetFilesize(file) > 10 * 1000000)
{
Expand Down
2 changes: 2 additions & 0 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ extern int nLiquidityProvider;
extern bool fEnableDarksend;
extern int64 enforceMasternodePaymentsTime;
extern std::string strMasterNodeAddr;
extern std::string strWalletFile;
extern std::string strDebugFile;
extern int nMasternodeMinProtocol;
extern int keysLoaded;
extern bool fSucessfullyLoaded;
Expand Down