Merge pull request #732
db1b2db
Reduce log noise (Howard Chu)9b3e43c
Fix issue #706 (Howard Chu)
This commit is contained in:
commit
d7fb03fc97
|
@ -240,6 +240,8 @@ mdb_txn_safe::mdb_txn_safe(const bool check) : m_txn(NULL), m_tinfo(NULL), m_che
|
||||||
|
|
||||||
mdb_txn_safe::~mdb_txn_safe()
|
mdb_txn_safe::~mdb_txn_safe()
|
||||||
{
|
{
|
||||||
|
if (!m_check)
|
||||||
|
return;
|
||||||
LOG_PRINT_L3("mdb_txn_safe: destructor");
|
LOG_PRINT_L3("mdb_txn_safe: destructor");
|
||||||
if (m_tinfo != nullptr)
|
if (m_tinfo != nullptr)
|
||||||
{
|
{
|
||||||
|
@ -263,7 +265,6 @@ mdb_txn_safe::~mdb_txn_safe()
|
||||||
}
|
}
|
||||||
mdb_txn_abort(m_txn);
|
mdb_txn_abort(m_txn);
|
||||||
}
|
}
|
||||||
if (m_check)
|
|
||||||
num_active_txns--;
|
num_active_txns--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2798,6 +2798,7 @@ void Blockchain::check_against_checkpoints(const checkpoints& points, bool enfor
|
||||||
{
|
{
|
||||||
const auto& pts = points.get_points();
|
const auto& pts = points.get_points();
|
||||||
|
|
||||||
|
CRITICAL_REGION_LOCAL(m_blockchain_lock);
|
||||||
m_db->batch_start();
|
m_db->batch_start();
|
||||||
for (const auto& pt : pts)
|
for (const auto& pt : pts)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue