Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-01-11 23:39:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

do not restore backup wallet cache if shutting down

Browse Source
This commit is contained in:
woodser 2025-01-08 21:24:31 -05:00
parent 1ac4c45f6d
commit d9f9c1e736
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
View File

@ -1343,6 +1343,7 @@ public class XmrWalletService extends XmrWalletBase {
try { try {
doMaybeInitMainWallet(sync, MAX_SYNC_ATTEMPTS); doMaybeInitMainWallet(sync, MAX_SYNC_ATTEMPTS);
} catch (Exception e) { } catch (Exception e) {
if (isShutDownStarted) return;
log.warn("Error initializing main wallet: {}\n", e.getMessage(), e); log.warn("Error initializing main wallet: {}\n", e.getMessage(), e);
HavenoUtils.setTopError(e.getMessage()); HavenoUtils.setTopError(e.getMessage());
throw e; throw e;
@ -1510,10 +1511,11 @@ public class XmrWalletService extends XmrWalletBase {
// try opening wallet // try opening wallet
config.setNetworkType(getMoneroNetworkType()); config.setNetworkType(getMoneroNetworkType());
config.setServer(connection); config.setServer(connection);
log.info("Opening full wallet " + config.getPath() + " with monerod=" + connection.getUri() + ", proxyUri=" + connection.getProxyUri()); log.info("Opening full wallet '{}' with monerod={}, proxyUri={}", config.getPath(), connection.getUri(), connection.getProxyUri());
try { try {
walletFull = MoneroWalletFull.openWallet(config); walletFull = MoneroWalletFull.openWallet(config);
} catch (Exception e) { } catch (Exception e) {
if (isShutDownStarted) throw e;
log.warn("Failed to open full wallet '{}', attempting to use backup cache files, error={}", config.getPath(), e.getMessage()); log.warn("Failed to open full wallet '{}', attempting to use backup cache files, error={}", config.getPath(), e.getMessage());
boolean retrySuccessful = false; boolean retrySuccessful = false;
try { try {
@ -1551,7 +1553,7 @@ public class XmrWalletService extends XmrWalletBase {
// retry opening wallet after cache deleted // retry opening wallet after cache deleted
try { try {
log.warn("Failed to open full wallet using backup cache files, retrying with cache deleted"); log.warn("Failed to open full wallet '{}' using backup cache files, retrying with cache deleted", config.getPath());
walletFull = MoneroWalletFull.openWallet(config); walletFull = MoneroWalletFull.openWallet(config);
log.warn("Successfully opened full wallet after cache deleted"); log.warn("Successfully opened full wallet after cache deleted");
retrySuccessful = true; retrySuccessful = true;
@ -1565,7 +1567,7 @@ public class XmrWalletService extends XmrWalletBase {
} else { } else {
// restore original wallet cache // restore original wallet cache
log.warn("Failed to open full wallet after deleting cache, restoring original cache"); log.warn("Failed to open full wallet '{}' after deleting cache, restoring original cache", config.getPath());
File cacheFile = new File(cachePath); File cacheFile = new File(cachePath);
if (cacheFile.exists()) cacheFile.delete(); if (cacheFile.exists()) cacheFile.delete();
if (originalCacheBackup.exists()) originalCacheBackup.renameTo(new File(cachePath)); if (originalCacheBackup.exists()) originalCacheBackup.renameTo(new File(cachePath));
@ -1637,11 +1639,12 @@ public class XmrWalletService extends XmrWalletBase {
if (!applyProxyUri) connection.setProxyUri(null); if (!applyProxyUri) connection.setProxyUri(null);
// try opening wallet // try opening wallet
log.info("Opening RPC wallet " + config.getPath() + " with monerod=" + connection.getUri() + ", proxyUri=" + connection.getProxyUri()); log.info("Opening RPC wallet '{}' with monerod={}, proxyUri={}", config.getPath(), connection.getUri(), connection.getProxyUri());
config.setServer(connection); config.setServer(connection);
try { try {
walletRpc.openWallet(config); walletRpc.openWallet(config);
} catch (Exception e) { } catch (Exception e) {
if (isShutDownStarted) throw e;
log.warn("Failed to open RPC wallet '{}', attempting to use backup cache files, error={}", config.getPath(), e.getMessage()); log.warn("Failed to open RPC wallet '{}', attempting to use backup cache files, error={}", config.getPath(), e.getMessage());
boolean retrySuccessful = false; boolean retrySuccessful = false;
try { try {
@ -1679,7 +1682,7 @@ public class XmrWalletService extends XmrWalletBase {
// retry opening wallet after cache deleted // retry opening wallet after cache deleted
try { try {
log.warn("Failed to open RPC wallet using backup cache files, retrying with cache deleted"); log.warn("Failed to open RPC wallet '{}' using backup cache files, retrying with cache deleted", config.getPath());
walletRpc.openWallet(config); walletRpc.openWallet(config);
log.warn("Successfully opened RPC wallet after cache deleted"); log.warn("Successfully opened RPC wallet after cache deleted");
retrySuccessful = true; retrySuccessful = true;
@ -1693,7 +1696,7 @@ public class XmrWalletService extends XmrWalletBase {
} else { } else {
// restore original wallet cache // restore original wallet cache
log.warn("Failed to open RPC wallet after deleting cache, restoring original cache"); log.warn("Failed to open RPC wallet '{}' after deleting cache, restoring original cache", config.getPath());
File cacheFile = new File(cachePath); File cacheFile = new File(cachePath);
if (cacheFile.exists()) cacheFile.delete(); if (cacheFile.exists()) cacheFile.delete();
if (originalCacheBackup.exists()) originalCacheBackup.renameTo(new File(cachePath)); if (originalCacheBackup.exists()) originalCacheBackup.renameTo(new File(cachePath));