Merge pull request #985 from ethcore/tx-queue-deadlock

Fixing transaction_queue deadlock
This commit is contained in:
Arkadiy Paronyan 2016-04-21 20:45:29 +02:00
commit 5fc944ae1d

View File

@ -247,11 +247,11 @@ impl MinerService for Miner {
match import {
Ok(ref res) => {
trace!(target: "own_tx", "Imported transaction to {:?} (hash: {:?})", res, hash);
trace!(target: "own_tx", "Status: {:?}", self.status());
trace!(target: "own_tx", "Status: {:?}", self.transaction_queue.status());
},
Err(ref e) => {
trace!(target: "own_tx", "Failed to import transaction {:?} (hash: {:?})", e, hash);
trace!(target: "own_tx", "Status: {:?}", self.status());
trace!(target: "own_tx", "Status: {:?}", self.transaction_queue.status());
},
}
import