Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-26 00:15:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

add more logs

Browse source
This commit is contained in:
Manfred Karrer 2015-11-03 23:44:36 +01:00
parent 3f42e5305a
commit 8e74890a13
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
View file

@ -46,6 +46,7 @@ import javax.inject.Named;
import java.io.File; import java.io.File;
import java.time.Duration; import java.time.Duration;
import java.util.Optional; import java.util.Optional;
import java.util.Random;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
@ -166,7 +167,7 @@ public class OpenOfferManager {
TimerTask timerTask = new TimerTask() { TimerTask timerTask = new TimerTask() {
@Override @Override
public void run() { public void run() {
Thread.currentThread().setName("RepublishOffers-%d"); Thread.currentThread().setName("RepublishOffers-" + String.valueOf(new Random().nextInt(1000)));
rePublishOffers(); rePublishOffers();
try { try {
} catch (Throwable t) { } catch (Throwable t) {

2
network/src/main/java/io/bitsquare/p2p/network/Connection.java
View file

@ -71,7 +71,7 @@ public class Connection {
uid = UUID.randomUUID().toString(); uid = UUID.randomUUID().toString();
final ThreadFactory threadFactory = new ThreadFactoryBuilder() final ThreadFactory threadFactory = new ThreadFactoryBuilder()
.setNameFormat("Connection-%d") .setNameFormat("Connection-" + socket.getLocalPort())
.setDaemon(true) .setDaemon(true)
.build(); .build();

28
network/src/main/java/io/bitsquare/p2p/routing/Routing.java
View file

@ -39,7 +39,7 @@ public class Routing {
private final Map<Address, Long> nonceMap = new ConcurrentHashMap<>(); private final Map<Address, Long> nonceMap = new ConcurrentHashMap<>();
private final List<RoutingListener> routingListeners = new CopyOnWriteArrayList<>(); private final List<RoutingListener> routingListeners = new CopyOnWriteArrayList<>();
private final Map<Address, Neighbor> connectedNeighbors = new ConcurrentHashMap<>(); private final Map<Address, Neighbor> connectedNeighbors = new ConcurrentHashMap<>();
private final List<Address> reportedNeighborAddresses = new CopyOnWriteArrayList<>(); private final Set<Address> reportedNeighborAddresses = Collections.synchronizedSet(new HashSet<>());
private final Map<Address, Runnable> authenticationCompleteHandlers = new ConcurrentHashMap<>(); private final Map<Address, Runnable> authenticationCompleteHandlers = new ConcurrentHashMap<>();
private final Timer maintenanceTimer = new Timer(); private final Timer maintenanceTimer = new Timer();
private final ExecutorService executorService; private final ExecutorService executorService;
@ -182,8 +182,9 @@ public class Routing {
public void broadcast(BroadcastMessage message, @Nullable Address sender) { public void broadcast(BroadcastMessage message, @Nullable Address sender) {
log.trace("Broadcast message to " + connectedNeighbors.values().size() + " neighbors."); log.trace("Broadcast message to " + connectedNeighbors.values().size() + " neighbors.");
log.trace("message = " + message); log.trace("message = " + message);
log.trace("connectedNeighbors = " + connectedNeighbors); printConnectedNeighborsMap();
connectedNeighbors.values().parallelStream()
connectedNeighbors.values().stream()
.filter(e -> !e.address.equals(sender)) .filter(e -> !e.address.equals(sender))
.forEach(neighbor -> { .forEach(neighbor -> {
log.trace("Broadcast message from " + getAddress() + " to " + neighbor.address + "."); log.trace("Broadcast message from " + getAddress() + " to " + neighbor.address + ".");
@ -459,20 +460,20 @@ public class Routing {
int diff = all - 100; int diff = all - 100;
List<Address> list = getNotConnectedNeighborAddresses(); List<Address> list = getNotConnectedNeighborAddresses();
for (int i = 0; i < diff; i++) { for (int i = 0; i < diff; i++) {
Address neighborToRemove = list.remove(new Random().nextInt(list.size())); Address toRemove = list.remove(new Random().nextInt(list.size()));
reportedNeighborAddresses.remove(neighborToRemove); reportedNeighborAddresses.remove(toRemove);
} }
} }
} }
private List<Address> getNotConnectedNeighborAddresses() { private List<Address> getNotConnectedNeighborAddresses() {
ArrayList<Address> reportedNeighborsList = new ArrayList<>(getAllNeighborAddresses()); ArrayList<Address> list = new ArrayList<>(getAllNeighborAddresses());
log.debug("## getNotConnectedNeighborAddresses "); log.debug("## getNotConnectedNeighborAddresses ");
log.debug("## reportedNeighborsList=" + reportedNeighborsList); log.debug("## reportedNeighborsList=" + list);
connectedNeighbors.values().stream().forEach(e -> reportedNeighborsList.remove(e.address)); connectedNeighbors.values().stream().forEach(e -> list.remove(e.address));
log.debug("## connectedNeighbors=" + connectedNeighbors); log.debug("## connectedNeighbors=" + connectedNeighbors);
log.debug("## reportedNeighborsList=" + reportedNeighborsList); log.debug("## reportedNeighborsList=" + list);
return reportedNeighborsList; return list;
} }
private void authenticateToNextRandomNeighbor() { private void authenticateToNextRandomNeighbor() {
@ -610,6 +611,10 @@ public class Routing {
if (disconnectedNeighbor != null) if (disconnectedNeighbor != null)
UserThread.execute(() -> routingListeners.stream().forEach(e -> e.onNeighborRemoved(peerAddress))); UserThread.execute(() -> routingListeners.stream().forEach(e -> e.onNeighborRemoved(peerAddress)));
log.trace("removeNeighbor [post]");
printConnectedNeighborsMap();
printReportedNeighborsMap();
log.trace("removeNeighbor nonceMap=" + nonceMap + " / peerAddress=" + peerAddress); log.trace("removeNeighbor nonceMap=" + nonceMap + " / peerAddress=" + peerAddress);
nonceMap.remove(peerAddress); nonceMap.remove(peerAddress);
} }
@ -626,6 +631,9 @@ public class Routing {
if (connectedNeighbors.size() > MAX_CONNECTIONS) if (connectedNeighbors.size() > MAX_CONNECTIONS)
disconnectOldConnections(); disconnectOldConnections();
log.trace("addConnectedNeighbor [post]");
printConnectedNeighborsMap();
} }
private Address getAddress() { private Address getAddress() {