mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-19 11:20:45 +00:00
core/txpool/locals: nil journal writer before checking close error
Clear journal.writer immediately after Close() so a failed close does not leave a stale file handle that could be reused on retry.
This commit is contained in:
parent
e3b6d0c86f
commit
a87a74f645
1 changed files with 3 additions and 2 deletions
|
|
@ -152,10 +152,11 @@ func (journal *journal) insert(tx *types.Transaction) error {
|
||||||
func (journal *journal) rotate(all map[common.Address]types.Transactions) error {
|
func (journal *journal) rotate(all map[common.Address]types.Transactions) error {
|
||||||
// Close the current journal (if any is open)
|
// Close the current journal (if any is open)
|
||||||
if journal.writer != nil {
|
if journal.writer != nil {
|
||||||
if err := journal.writer.Close(); err != nil {
|
err := journal.writer.Close()
|
||||||
|
journal.writer = nil
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
journal.writer = nil
|
|
||||||
}
|
}
|
||||||
// Generate a new journal with the contents of the current pool
|
// Generate a new journal with the contents of the current pool
|
||||||
replacement, err := os.OpenFile(journal.path+".new", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
|
replacement, err := os.OpenFile(journal.path+".new", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue