Terminate process on SIGINT in all cases

This commit is contained in:
Nik Bougalis
2015-04-28 14:50:54 -07:00
committed by Tom Ritchford
parent 90bb53af20
commit f8bfe3a550

View File

@@ -414,7 +414,7 @@ public:
, m_entropyTimer (this)
, m_signals(get_io_service(), SIGINT)
, m_signals (get_io_service())
, m_resolver (ResolverAsio::New (get_io_service(), m_logs.journal("Resolver")))
@@ -677,9 +677,11 @@ public:
// VFALCO NOTE: 0 means use heuristics to determine the thread count.
m_jobQueue->setThreadCount (0, getConfig ().RUN_STANDALONE);
// We want to intercept and wait for CTRL-C to terminate the process
m_signals.add (SIGINT);
m_signals.async_wait(std::bind(&ApplicationImp::signalled, this,
std::placeholders::_1,
std::placeholders::_2));
std::placeholders::_1, std::placeholders::_2));
assert (mTxnDB == nullptr);
@@ -1403,7 +1405,7 @@ static void addTxnSeqField ()
Blob txnMeta;
soci::statement st =
(session.prepare <<
(session.prepare <<
"SELECT TransID, TxnMeta FROM Transactions;",
soci::into(strTransId),
soci::into(sociTxnMetaBlob, tmi));