mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor: Add handler, make onMissedSecondTick default

Browse source
This commit is contained in:
Manfred Karrer 2019-02-05 20:43:46 +01:00
parent 26ffe14778
commit dcf40bcfb5
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
5 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/src/main/java/bisq/common/Clock.java
View file

@ -21,17 +21,24 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
// Helps configure listener objects that are run by the `UserThread` each second
// and can do per second, per minute and delayed second actions.
@Slf4j
public class Clock {
public static final int IDLE_TOLERANCE = 20000;
public static final int IDLE_TOLERANCE_MS = 20000;
public interface Listener {
void onSecondTick();
void onMinuteTick();
void onMissedSecondTick(long missed);
default void onMissedSecondTick(long missedMs) {
}
default void onAwakeFromStandby(long missedMs) {
}
}
private Timer timer;
@ -55,9 +62,15 @@ public class Clock {
long currentTimeMillis = System.currentTimeMillis();
long diff = currentTimeMillis - lastSecondTick;
if (diff > 1000)
listeners.forEach(listener -> listener.onMissedSecondTick(diff - 1000));
if (diff > 1000) {
long missedMs = diff - 1000;
listeners.forEach(listener -> listener.onMissedSecondTick(missedMs));
if (missedMs > Clock.IDLE_TOLERANCE_MS) {
log.info("We have been in standby mode for {} sec", missedMs / 1000);
listeners.forEach(listener -> listener.onAwakeFromStandby(missedMs));
}
}
lastSecondTick = currentTimeMillis;
}, 1, TimeUnit.SECONDS);
}

4
core/src/main/java/bisq/core/trade/TradeManager.java
View file

@ -636,10 +636,6 @@ public class TradeManager implements PersistedDataHost {
public void onMinuteTick() {
updateTradePeriodState();
}
@Override
public void onMissedSecondTick(long missed) {
}
});
}

4
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
View file

@ -149,10 +149,6 @@ public abstract class TradeStepView extends AnchorPane {
public void onMinuteTick() {
updateTimeLeft();
}
@Override
public void onMissedSecondTick(long missed) {
}
};
}

4
desktop/src/main/java/bisq/desktop/main/settings/network/P2pNetworkListItem.java
View file

@ -81,10 +81,6 @@ public class P2pNetworkListItem {
@Override
public void onMinuteTick() {
}
@Override
public void onMissedSecondTick(long missed) {
}
};
clock.addListener(listener);
onLastActivityChanged(statistic.getLastActivityTimestamp());

10
p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java
View file

@ -151,12 +151,10 @@ public class PeerManager implements ConnectionListener, PersistedDataHost {
}
@Override
public void onMissedSecondTick(long missed) {
if (missed > Clock.IDLE_TOLERANCE) {
log.info("We have been in standby mode for {} sec", missed / 1000);
stopped = false;
listeners.stream().forEach(Listener::onAwakeFromStandby);
}
public void onAwakeFromStandby(long missedMs) {
// TODO is "stopped = false;" correct?
stopped = false;
listeners.forEach(Listener::onAwakeFromStandby);
}
};
clock.addListener(listener);