From cab5c42c1395be127479cbfd6eef5c0a5f8b2eb1 Mon Sep 17 00:00:00 2001
From: Luca Keidel <info@lucakeidel.de>
Date: Tue, 14 Jun 2016 12:21:35 +0200
Subject: [PATCH] Fixed config loading and introduced remote addresses instead
of local addresses
---
src/main/java/fucoin/AbstractNode.java | 12 ++++--------
src/main/java/fucoin/Main.java | 2 +-
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/fucoin/AbstractNode.java b/src/main/java/fucoin/AbstractNode.java
index 9deab96..de7f587 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 620d8d9..36991ab 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");
}
--
GitLab