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

Cosmetics

Browse Source
This commit is contained in:
Florian Reimair 2019-03-03 10:52:58 +01:00
parent 9f464b3d50
commit 1c4535eab8
No known key found for this signature in database
GPG Key ID: 7EA8CA324B6E5633
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshot.java
View File

@ -47,8 +47,6 @@ import com.google.common.util.concurrent.SettableFuture;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
@ -80,9 +78,6 @@ public class P2PSeedNodeSnapshot extends Metric implements MessageListener {
private static final String HOSTS = "run.hosts"; private static final String HOSTS = "run.hosts";
private static final String TOR_PROXY_PORT = "run.torProxyPort"; private static final String TOR_PROXY_PORT = "run.torProxyPort";
Statistics statistics; Statistics statistics;
private NetworkNode networkNode;
private final File torHiddenServiceDir = new File("metric_" + getName());
private int nonce;
final Map<NodeAddress, Statistics> bucketsPerHost = new ConcurrentHashMap<>(); final Map<NodeAddress, Statistics> bucketsPerHost = new ConcurrentHashMap<>();
private final Set<byte[]> hashes = new TreeSet<>(Arrays::compare); private final Set<byte[]> hashes = new TreeSet<>(Arrays::compare);
private final ThreadGate gate = new ThreadGate(); private final ThreadGate gate = new ThreadGate();
@ -160,9 +155,9 @@ public class P2PSeedNodeSnapshot extends Metric implements MessageListener {
@Override @Override
protected void execute() { protected void execute() {
// start the network node // start the network node
networkNode = new TorNetworkNode(Integer.parseInt(configuration.getProperty(TOR_PROXY_PORT, "9054")), final NetworkNode networkNode = new TorNetworkNode(Integer.parseInt(configuration.getProperty(TOR_PROXY_PORT, "9054")),
new CoreNetworkProtoResolver(), false, new CoreNetworkProtoResolver(), false,
new AvailableTor(Monitor.TOR_WORKING_DIR, torHiddenServiceDir.getName())); new AvailableTor(Monitor.TOR_WORKING_DIR, "unused"));
// we do not need to start the networkNode, as we do not need the HS // we do not need to start the networkNode, as we do not need the HS
//networkNode.start(this); //networkNode.start(this);
@ -179,9 +174,8 @@ public class P2PSeedNodeSnapshot extends Metric implements MessageListener {
NodeAddress target = OnionParser.getNodeAddress(current); NodeAddress target = OnionParser.getNodeAddress(current);
// do the data request // do the data request
nonce = new Random().nextInt();
SettableFuture<Connection> future = networkNode.sendMessage(target, SettableFuture<Connection> future = networkNode.sendMessage(target,
new PreliminaryGetDataRequest(nonce, hashes)); new PreliminaryGetDataRequest(new Random().nextInt(), hashes));
Futures.addCallback(future, new FutureCallback<>() { Futures.addCallback(future, new FutureCallback<>() {
@Override @Override

2
monitor/src/main/java/bisq/monitor/reporter/ConsoleReporter.java
View File

@ -56,7 +56,7 @@ public class ConsoleReporter extends Reporter {
String report = "bisq" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "") String report = "bisq" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "")
+ (prefix.isEmpty() ? "" : "." + prefix) + (prefix.isEmpty() ? "" : "." + prefix)
+ (key.isEmpty() ? "" : "." + key) + (key.isEmpty() ? "" : "." + key)
+ " " + value + " " + timestamp + "\n"; + " " + value + " " + timestamp;
System.err.println("Report: " + report); System.err.println("Report: " + report);
}); });
} }