mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master_upstream' into reduce-initial-date-request

Browse Source
This commit is contained in:
chimp1984 2020-10-02 13:05:56 -05:00
commit 25a7979b02
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/bisq/common/setup/CommonSetup.java
View File

@ -54,7 +54,6 @@ public class CommonSetup {
Version.printVersion();
maybePrintPathOfCodeSource();
Profiler.printSystemLoad();
UserThread.runPeriodically(Profiler::printSystemLoad, 10, TimeUnit.MINUTES);
setSystemProperties();
setupSigIntHandlers(gracefulShutDownHandler);
@ -62,6 +61,10 @@ public class CommonSetup {
DevEnv.setup(config);
}
public static void printSystemLoadPeriodically(int delayMin) {
UserThread.runPeriodically(Profiler::printSystemLoad, delayMin, TimeUnit.MINUTES);
}
public static void setupUncaughtExceptionHandler(UncaughtExceptionHandler uncaughtExceptionHandler) {
Thread.UncaughtExceptionHandler handler = (thread, throwable) -> {
// Might come from another thread

4
core/src/main/java/bisq/core/app/BisqExecutable.java
View File

@ -98,7 +98,6 @@ public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSet
CommonSetup.setup(config, this);
CoreSetup.setup(config);
configUserThread();
addCapabilities();
// If application is JavaFX application we need to wait until it is initialized
@ -121,10 +120,11 @@ public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSet
// Headless versions can call inside launchApplication the onApplicationLaunched() manually
protected void onApplicationLaunched() {
configUserThread();
CommonSetup.printSystemLoadPeriodically(10);
// As the handler method might be overwritten by subclasses and they use the application as handler
// we need to setup the handler after the application is created.
CommonSetup.setupUncaughtExceptionHandler(this);
setupGuice();
setupAvoidStandbyMode();
startApplication();

2
core/src/main/resources/i18n/displayStrings.properties
View File

@ -3042,7 +3042,7 @@ txIdTextField.missingTx.warning.tooltip=Missing required transaction
navigation.account=\"Account\"
navigation.account.walletSeed=\"Account/Wallet seed\"
navigation.funds.availableForWithdrawal=\"Fund/Send funds\"
navigation.funds.availableForWithdrawal=\"Funds/Send funds\"
navigation.portfolio.myOpenOffers=\"Portfolio/My open offers\"
navigation.portfolio.pending=\"Portfolio/Open trades\"
navigation.portfolio.closedTrades=\"Portfolio/History\"

2
pricenode/src/main/java/bisq/price/mining/providers/MempoolFeeRateProvider.java
View File

@ -91,7 +91,7 @@ abstract class MempoolFeeRateProvider extends FeeRateProvider {
private long getEstimatedFeeRate() {
return getFeeRatePredictions()
.filter(p -> p.getKey().equalsIgnoreCase("halfHourFee"))
.filter(p -> p.getKey().equalsIgnoreCase("fastestFee"))
.map(Map.Entry::getValue)
.findFirst()
.map(r -> {