diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-02-06 10:09:24 +1300 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-02-06 10:10:51 +1300 |
| commit | 30e799a5f7053d4050280aced2c9d8c5f0fea20e (patch) | |
| tree | 481c7755a0a3117a30ff47cd4b149eab928ecf4d /src/wallet/db.cpp | |
| parent | 3a573fd46c75ed76df38580d45cc36c6d598f3ea (diff) | |
| parent | d3bf3b930d34da7d121ae35b4fb75865ed73208c (diff) | |
Merge #15297: wallet: Releases dangling files on BerkeleyEnvironment::Close
d3bf3b930 qa: Test .walletlock file is closed (João Barbosa)
2f8b8f479 wallet: Close wallet env lock file (João Barbosa)
8602a1e6a wallet: Close dbenv error file db.log (João Barbosa)
Pull request description:
This PR closes `db.log` and removes `.walletlock` files when `BerkeleyEnvironment` is closed.
Fixes https://github.com/bitcoin/bitcoin/issues/15291#issuecomment-459131886.
Tree-SHA512: 05d8b027feea914e0ba873e75d117857473d1fd7b400e41bd473d638171fa39d5be048990bf685dc0807f7d92418579b763056dc2a6dcf6b96777d5688ddee04
Diffstat (limited to 'src/wallet/db.cpp')
| -rw-r--r-- | src/wallet/db.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index cfa9bdd20e..c64a85c910 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -126,11 +126,18 @@ void BerkeleyEnvironment::Close() } } + FILE* error_file = nullptr; + dbenv->get_errfile(&error_file); + int ret = dbenv->close(0); if (ret != 0) LogPrintf("BerkeleyEnvironment::Close: Error %d closing database environment: %s\n", ret, DbEnv::strerror(ret)); if (!fMockDb) DbEnv((u_int32_t)0).remove(strPath.c_str(), 0); + + if (error_file) fclose(error_file); + + UnlockDirectory(strPath, ".walletlock"); } void BerkeleyEnvironment::Reset() |