From 28e1ce4239e5dbf368705f95166766befa25fe1e Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 15 Oct 2014 09:35:17 +0200 Subject: [PATCH] Add logs, cleanup --- src/main/java/io/bitsquare/BitSquare.java | 8 +++++--- .../java/io/bitsquare/msg/BootstrappedPeerFactory.java | 10 +++++++++- src/main/java/io/bitsquare/msg/SeedNodeAddress.java | 2 ++ src/main/java/io/bitsquare/msg/actor/DHTManager.java | 8 +------- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/BitSquare.java index e3801fb7ec..ab2ece124f 100644 --- a/src/main/java/io/bitsquare/BitSquare.java +++ b/src/main/java/io/bitsquare/BitSquare.java @@ -40,6 +40,7 @@ import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; public class BitSquare { + private static final Logger log = LoggerFactory.getLogger(BitSquare.class); private static String appName = "Bitsquare"; @@ -80,12 +81,13 @@ public class BitSquare { try { Object m = inbox.receive(FiniteDuration.create(5L, "seconds")); if (m instanceof PeerInitialized) { - System.out.println("Seed Peer Initialized on port " + ((PeerInitialized) m).getPort + log.debug("Seed Peer Initialized on port " + ((PeerInitialized) m).getPort ()); } } catch (Exception e) { if (!(e instanceof TimeoutException)) { quit = true; + log.error(e.getMessage()); } } } @@ -94,9 +96,9 @@ public class BitSquare { actorSystem.awaitTermination(Duration.create(5L, "seconds")); } catch (Exception ex) { if (ex instanceof TimeoutException) - System.out.println("ActorSystem did not shutdown properly."); + log.error("ActorSystem did not shutdown properly."); else - System.out.println(ex.getMessage()); + log.error(ex.getMessage()); } }); seedNodeThread.start(); diff --git a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java index fc56855367..ac397be903 100644 --- a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java +++ b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java @@ -115,8 +115,16 @@ public class BootstrappedPeerFactory { public ListenableFuture start() { try { int randomPort = new Ports().tcpPort(); + //randomPort = 6500; + /* ChannelServerConficuration csc = PeerBuilder.createDefaultChannelServerConfiguration(); + csc.idleTCPSeconds(20).idleUDPSeconds(20).connectionTimeoutTCPMillis(20000); + Peer peer = new PeerBuilder(keyPair).ports(randomPort).channelServerConfiguration(csc).start();*/ Peer peer = new PeerBuilder(keyPair).ports(randomPort).start(); - PeerDHT peerDHT = new PeerBuilderDHT(peer).storageLayer(new StorageLayer(storage)).start(); + /* Peer peer = new PeerBuilder(keyPair).ports(randomPort).portsExternal(randomPort) + .channelServerConfiguration(csc).start(); + */ + PeerDHT peerDHT = new PeerBuilderDHT(peer).storageLayer(new StorageLayer + (storage)).start(); peer.peerBean().peerMap().addPeerMapChangeListener(new PeerMapChangeListener() { @Override diff --git a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java index 268d740514..0cb01f9789 100644 --- a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java +++ b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java @@ -55,6 +55,8 @@ public class SeedNodeAddress { /////////////////////////////////////////////////////////////////////////////////////////// public enum StaticSeedNodeAddresses { + // Manfreds server: "188.226.179.109" + // Steves server: "128.199.251.106" DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000), DIGITAL_OCEAN2("digitalocean2.bitsquare.io", "128.199.251.106", 5000), LOCALHOST("localhost", "127.0.0.1", 5000); diff --git a/src/main/java/io/bitsquare/msg/actor/DHTManager.java b/src/main/java/io/bitsquare/msg/actor/DHTManager.java index eab9db2ae1..43d6fd1ae4 100644 --- a/src/main/java/io/bitsquare/msg/actor/DHTManager.java +++ b/src/main/java/io/bitsquare/msg/actor/DHTManager.java @@ -17,12 +17,9 @@ package io.bitsquare.msg.actor; -import io.bitsquare.msg.SeedNodeAddress; import io.bitsquare.msg.actor.command.InitializePeer; import io.bitsquare.msg.actor.event.PeerInitialized; -import java.util.List; - import net.tomp2p.dht.PeerBuilderDHT; import net.tomp2p.dht.PeerDHT; import net.tomp2p.nat.PeerBuilderNAT; @@ -63,10 +60,6 @@ public class DHTManager extends AbstractActor { log.debug("Received message: {}", ip); try { - List staticSedNodeAddresses = SeedNodeAddress - .StaticSeedNodeAddresses.getAllSeedNodeAddresses(); - SeedNodeAddress seedNodeAddress = new SeedNodeAddress(staticSedNodeAddresses.get(0)); - peer = new PeerBuilder(ip.getPeerId()).ports(ip.getPort()) .start(); @@ -92,6 +85,7 @@ public class DHTManager extends AbstractActor { .bootstrapTo(ip.getBootstrapPeers()).start(); futureBootstrap.awaitUninterruptibly(bootstrapTimeout); }*/ + sender().tell(new PeerInitialized(peer.peerID(), ip.getPort()), self()); } catch (Throwable t) { log.info("The second instance has been started. If that happens at the first instance" +