chaintool
/
chainqueue
4
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Add external session to tx obsolete method

This commit is contained in:
nolash 2021-04-05 12:59:45 +02:00
parent e29bc6fa8c
commit 449a748b82
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chainqueue/state.py
View File

@ -301,8 +301,9 @@ def get_state_log(chain_spec, tx_hash, session=None):
def cancel_obsoletes_by_cache(chain_spec, tx_hash):
session = SessionBase.create_session()
def obsolete_by_cache(chain_spec, tx_hash, final, session=None):
session = SessionBase.bind_session(session)
q = session.query(
Otx.nonce.label('nonce'),
TxCache.sender.label('sender'),
@ -324,7 +325,8 @@ def cancel_obsoletes_by_cache(chain_spec, tx_hash):
for otwo in q.all():
try:
otwo.cancel(True, session=session)
otwo.cancel(final, session=session)
logg.debug('cancel {} final {}'.format(tx_hash, final))
except TxStateChangeError as e:
logg.exception('cancel non-final fail: {}'.format(e))
session.close()
@ -334,6 +336,7 @@ def cancel_obsoletes_by_cache(chain_spec, tx_hash):
session.close()
raise(e)
session.commit()
session.close()
SessionBase.release_session(session)
return tx_hash