status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add addRemoteServer for light JSON-RPC to support multiple servers and auto recurring over them to find working one.

This commit is contained in:
Yaroslav Dmytrotsa 2015-07-09 20:50:50 +03:00
parent b35ffa0581
commit 5c9058d980
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ethereumj-core-android/src/main/java/org/ethereum/android/jsonrpc/light/JsonRpcServer.java
View File

@ -37,12 +37,16 @@ import static io.netty.handler.codec.http.HttpHeaders.Names.*;
import org.ethereum.android.jsonrpc.light.method.*; import org.ethereum.android.jsonrpc.light.method.*;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.URL;
import java.util.ArrayList;
public final class JsonRpcServer extends org.ethereum.android.jsonrpc.JsonRpcServer{ public final class JsonRpcServer extends org.ethereum.android.jsonrpc.JsonRpcServer{
static public final int PORT = 8545; static public final int PORT = 8545;
static public final String RemoteServer = "http://192.168.1.30:8545/"; static private ArrayList<URL> RemoteServer = new ArrayList<>();
static private int currentRemoteServer = 0;
static public boolean IsRemoteServerRecuring = false;
private Ethereum ethereum; private Ethereum ethereum;
private Dispatcher dispatcher; private Dispatcher dispatcher;
@ -72,6 +76,25 @@ public final class JsonRpcServer extends org.ethereum.android.jsonrpc.JsonRpcSer
this.dispatcher.register(new proxy(this.ethereum)); this.dispatcher.register(new proxy(this.ethereum));
FilterManager.getInstance(); FilterManager.getInstance();
addRemoteServer("http://192.168.1.30:8545/");
}
public static void addRemoteServer(String address) {
try {
RemoteServer.add(new URL(address));
} catch (Exception e) {
}
}
public static URL getRemoteServer() {
if (currentRemoteServer >= RemoteServer.size()){
currentRemoteServer = 0;
IsRemoteServerRecuring = true;
}
URL res = RemoteServer.get(currentRemoteServer);
currentRemoteServer++;
return res;
} }
public void start() throws Exception { public void start() throws Exception {

11
ethereumj-core-android/src/main/java/org/ethereum/android/jsonrpc/light/JsonRpcServerMethod.java
View File

@ -147,18 +147,19 @@ public abstract class JsonRpcServerMethod implements RequestHandler {
protected JSONRPC2Response getRemoteData(JSONRPC2Request req) { protected JSONRPC2Response getRemoteData(JSONRPC2Request req) {
if (jpSession == null) { if (jpSession == null) {
try { jpSession = new JSONRPC2Session(JsonRpcServer.getRemoteServer());
jpSession = new JSONRPC2Session(new URL(JsonRpcServer.RemoteServer));
} catch (Exception e) {
return null;
}
} }
try { try {
return jpSession.send(req); return jpSession.send(req);
} catch (Exception e) { } catch (Exception e) {
jpSession = new JSONRPC2Session(JsonRpcServer.getRemoteServer());
if (!JsonRpcServer.IsRemoteServerRecuring) {
return getRemoteData(req);
} else {
return null; return null;
} }
} }
}
protected byte[] getCoinBase() { protected byte[] getCoinBase() {
return ((Account) ethereum.getWallet().getAccountCollection().toArray()[0]).getEcKey().getAddress(); return ((Account) ethereum.getWallet().getAccountCollection().toArray()[0]).getEcKey().getAddress();