mirror of
https://github.com/haveno-dex/haveno.git
synced 2024-10-01 01:35:48 -04:00
limit switch connection requests to 3 per minute
This commit is contained in:
parent
41e63805c1
commit
cb132e727a
@ -107,9 +107,9 @@ public final class XmrConnectionService {
|
|||||||
|
|
||||||
// connection switching
|
// connection switching
|
||||||
private static final int EXCLUDE_CONNECTION_SECONDS = 300;
|
private static final int EXCLUDE_CONNECTION_SECONDS = 300;
|
||||||
private static final int SKIP_SWITCH_WITHIN_MS = 60000;
|
private static final int MAX_SWITCH_REQUESTS_PER_MINUTE = 3;
|
||||||
private Set<MoneroRpcConnection> excludedConnections = new HashSet<>();
|
private Set<MoneroRpcConnection> excludedConnections = new HashSet<>();
|
||||||
private long lastSwitchRequestTimestamp;
|
private int numRequestsLastMinute;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public XmrConnectionService(P2PService p2PService,
|
public XmrConnectionService(P2PService p2PService,
|
||||||
@ -279,18 +279,21 @@ public final class XmrConnectionService {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// skip if last switch was too recent
|
// skip if too many requests in the last minute
|
||||||
boolean skipSwitch = System.currentTimeMillis() - lastSwitchRequestTimestamp < SKIP_SWITCH_WITHIN_MS;
|
if (numRequestsLastMinute > MAX_SWITCH_REQUESTS_PER_MINUTE) {
|
||||||
lastSwitchRequestTimestamp = System.currentTimeMillis();
|
log.warn("Skipping switch to next best Monero connection because more than {} requests were made in the last minute", MAX_SWITCH_REQUESTS_PER_MINUTE);
|
||||||
if (skipSwitch) {
|
|
||||||
log.warn("Skipping switch to next best Monero connection because last switch was less than {} seconds ago", SKIP_SWITCH_WITHIN_MS / 1000);
|
|
||||||
lastSwitchRequestTimestamp = System.currentTimeMillis();
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// try to get connection to switch to
|
// increment request count
|
||||||
|
numRequestsLastMinute++;
|
||||||
|
UserThread.runAfter(() -> numRequestsLastMinute--, 60); // decrement after one minute
|
||||||
|
|
||||||
|
// exclude current connection
|
||||||
MoneroRpcConnection currentConnection = getConnection();
|
MoneroRpcConnection currentConnection = getConnection();
|
||||||
if (currentConnection != null) excludedConnections.add(currentConnection);
|
if (currentConnection != null) excludedConnections.add(currentConnection);
|
||||||
|
|
||||||
|
// get connection to switch to
|
||||||
MoneroRpcConnection bestConnection = getBestAvailableConnection(excludedConnections);
|
MoneroRpcConnection bestConnection = getBestAvailableConnection(excludedConnections);
|
||||||
|
|
||||||
// remove from excluded connections after period
|
// remove from excluded connections after period
|
||||||
|
Loading…
Reference in New Issue
Block a user