crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Disregard exceptions in the bootstrap creation cleanup process because these don't affect the created bootstrap - instead just log the exception and full stack trace.

Browse Source
This commit is contained in:
CalDescent 2021-10-09 11:38:13 +01:00
parent a3dcacade9
commit f6c1a7e6db
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/org/qortal/repository/Bootstrap.java
View File

@ -278,21 +278,33 @@ public class Bootstrap {
throw new DataException(String.format("Unable to create bootstrap due to timeout: %s", e.getMessage()));
}
finally {
LOGGER.info("Re-importing local data...");
Path exportPath = HSQLDBImportExport.getExportDirectory(false);
repository.importDataFromFile(Paths.get(exportPath.toString(), "TradeBotStates.json").toString());
repository.importDataFromFile(Paths.get(exportPath.toString(), "MintingAccounts.json").toString());
try {
LOGGER.info("Re-importing local data...");
Path exportPath = HSQLDBImportExport.getExportDirectory(false);
repository.importDataFromFile(Paths.get(exportPath.toString(), "TradeBotStates.json").toString());
repository.importDataFromFile(Paths.get(exportPath.toString(), "MintingAccounts.json").toString());
} catch (IOException e) {
LOGGER.info("Unable to re-import local data, but created bootstrap is still valid. {}", e);
}
LOGGER.info("Unlocking blockchain...");
blockchainLock.unlock();
// Cleanup
if (inputPath != null) {
FileUtils.deleteDirectory(inputPath.toFile());
LOGGER.info("Cleaning up...");
try {
if (inputPath != null) {
FileUtils.deleteDirectory(inputPath.toFile());
}
if (outputPath != null) {
FileUtils.deleteDirectory(outputPath.toFile());
}
this.deleteAllTempDirectories();
} catch (IOException e) {
LOGGER.info("Error during cleanup, but created bootstrap is still valid. {}", e);
}
if (outputPath != null) {
FileUtils.deleteDirectory(outputPath.toFile());
}
this.deleteAllTempDirectories();
}
}