diff --git a/src/main/java/fucoin/AbstractNode.java b/src/main/java/fucoin/AbstractNode.java index 9deab9659300d50e0befa9687364eda45906fce5..de7f5876c7ef5bd882865d7cffc72ca030b0e697 100644 --- a/src/main/java/fucoin/AbstractNode.java +++ b/src/main/java/fucoin/AbstractNode.java @@ -1,6 +1,7 @@ package fucoin; import akka.actor.ActorRef; +import akka.actor.Address; import akka.actor.UntypedActor; import fucoin.wallet.AbstractWallet; @@ -20,7 +21,8 @@ public abstract class AbstractNode extends UntypedActor implements Serializable } public String getAddress(ActorRef self) { - return self.path().toSerializationFormatWithAddress(self.path().address()); + Address remoteAddr = getContext().system().provider().getDefaultAddress(); + return self.path().toStringWithAddress(remoteAddr); } /** @@ -66,13 +68,7 @@ public abstract class AbstractNode extends UntypedActor implements Serializable } public void log(String string) { - if (this instanceof AbstractWallet){ - System.out.println("Yes: "+string); - ((AbstractWallet) this).log(string); - }else{ - System.out.println("No: "+this.getClass()); - System.out.println(getSelf().path().name() + ": " + string); - } + System.out.println(getSelf().path().name() + ": " + string); } } \ No newline at end of file diff --git a/src/main/java/fucoin/Main.java b/src/main/java/fucoin/Main.java index 620d8d92293f50dab9c62d72a66ae7ee44856878..36991aba69288b73e9196b5b2199d35abdb90fa6 100644 --- a/src/main/java/fucoin/Main.java +++ b/src/main/java/fucoin/Main.java @@ -30,7 +30,7 @@ public class Main { Config config = ConfigFactory.parseFile(file); if (!file.exists()) { System.out.println("Load default application.conf"); - config = ConfigFactory.parseResources("application.config"); + config = ConfigFactory.parseResources("application.conf"); } else { System.out.println("Load local application.conf"); }