Bugfix: Describe dblogsize option correctly (it refers to the wallet database, not memory pool)

luke-jr · luke-jr · commit 420a82f1ae2f · 2015-10-01T23:16:42.000Z
diff --git a/src/init.cpp b/src/init.cpp
@@ -404,7 +404,7 @@ std::string HelpMessage(HelpMessageMode mode)
     if (showDebug)
     {
         strUsage += HelpMessageOpt("-checkpoints", strprintf("Disable expensive verification for known chain history (default: %u)", 1));
-        strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush database activity from memory pool to disk log every <n> megabytes (default: %u)", 100));
+        strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DEFAULT_WALLET_DBLOGSIZE));
         strUsage += HelpMessageOpt("-disablesafemode", strprintf("Disable safemode, override a real safe mode event (default: %u)", 0));
         strUsage += HelpMessageOpt("-testsafemode", strprintf("Force safe mode (default: %u)", 0));
         strUsage += HelpMessageOpt("-dropmessagestest=<n>", "Randomly drop 1 of every <n> network messages");
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -293,7 +293,7 @@ void CDB::Flush()
     if (fReadOnly)
         nMinutes = 1;
 
-    bitdb.dbenv->txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100) * 1024 : 0, nMinutes, 0);
+    bitdb.dbenv->txn_checkpoint(nMinutes ? GetArg("-dblogsize", DEFAULT_WALLET_DBLOGSIZE) * 1024 : 0, nMinutes, 0);
 }
 
 void CDB::Close()
diff --git a/src/wallet/db.h b/src/wallet/db.h
@@ -20,6 +20,8 @@
 
 #include <db_cxx.h>
 
+static const unsigned int DEFAULT_WALLET_DBLOGSIZE = 100;
+
 extern unsigned int nWalletDBUpdated;
 
 class CDBEnv

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ std::string HelpMessage(HelpMessageMode mode)`
`404`	`404`	`if (showDebug)`
`405`	`405`	`{`
`406`	`406`	`strUsage += HelpMessageOpt("-checkpoints", strprintf("Disable expensive verification for known chain history (default: %u)", 1));`
`407`		`- strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush database activity from memory pool to disk log every <n> megabytes (default: %u)", 100));`
	`407`	`+ strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DEFAULT_WALLET_DBLOGSIZE));`
`408`	`408`	`strUsage += HelpMessageOpt("-disablesafemode", strprintf("Disable safemode, override a real safe mode event (default: %u)", 0));`
`409`	`409`	`strUsage += HelpMessageOpt("-testsafemode", strprintf("Force safe mode (default: %u)", 0));`
`410`	`410`	`strUsage += HelpMessageOpt("-dropmessagestest=<n>", "Randomly drop 1 of every <n> network messages");`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ void CDB::Flush()`
`293`	`293`	`if (fReadOnly)`
`294`	`294`	`nMinutes = 1;`
`295`	`295`
`296`		`- bitdb.dbenv->txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100) * 1024 : 0, nMinutes, 0);`
	`296`	`+ bitdb.dbenv->txn_checkpoint(nMinutes ? GetArg("-dblogsize", DEFAULT_WALLET_DBLOGSIZE) * 1024 : 0, nMinutes, 0);`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`void CDB::Close()`