summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/same
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-25 12:10:57 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-25 12:10:57 +0200
commit768938fa1e2bfaa5a246e28badefc7d8fe7cadd3 (patch)
tree29e17a0603922c087db4c24804ba22db290e8eaa /same/src/main/java/com/orbekk/same
parenta8b921e07bf4ad1936e01628049a9c6fd7349312 (diff)
Add debug messages in Paxos service.
– Remove old PaxosService.
Diffstat (limited to 'same/src/main/java/com/orbekk/same')
-rw-r--r--same/src/main/java/com/orbekk/same/Client.java2
-rw-r--r--same/src/main/java/com/orbekk/same/ConnectionManager.java2
-rw-r--r--same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java1
-rw-r--r--same/src/main/java/com/orbekk/same/TestConnectionManager.java1
4 files changed, 1 insertions, 5 deletions
diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index 27ce787..5a7918c 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -70,7 +70,7 @@ public class Client {
public void run(Services.UpdateComponentResponse response) {
if (!rpc.isOk()) {
logger.warn("Master failed to respond to update " +
- "request: {}", rpc);
+ "request: {}", rpc.errorText());
op.complete(DelayedOperation.Status.createError(
"Error contacting master. Try again later."));
startMasterElection();
diff --git a/same/src/main/java/com/orbekk/same/ConnectionManager.java b/same/src/main/java/com/orbekk/same/ConnectionManager.java
index 6fe8669..0002016 100644
--- a/same/src/main/java/com/orbekk/same/ConnectionManager.java
+++ b/same/src/main/java/com/orbekk/same/ConnectionManager.java
@@ -1,7 +1,5 @@
package com.orbekk.same;
-import com.orbekk.paxos.PaxosService;
-
/**
* An interface that returns a connection for a participant.
*
diff --git a/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java b/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
index 0e199d6..280df9b 100644
--- a/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
+++ b/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
@@ -16,7 +16,6 @@ import java.util.concurrent.FutureTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.orbekk.paxos.PaxosService;
import com.orbekk.protobuf.RpcChannel;
public class ConnectionManagerImpl implements ConnectionManager {
diff --git a/same/src/main/java/com/orbekk/same/TestConnectionManager.java b/same/src/main/java/com/orbekk/same/TestConnectionManager.java
index 5d97903..6438c8f 100644
--- a/same/src/main/java/com/orbekk/same/TestConnectionManager.java
+++ b/same/src/main/java/com/orbekk/same/TestConnectionManager.java
@@ -3,7 +3,6 @@ package com.orbekk.same;
import java.util.Map;
import java.util.HashMap;
-import com.orbekk.paxos.PaxosService;
import com.orbekk.same.Services.Directory;
import com.orbekk.same.Services.Master;
import com.orbekk.same.Services.Paxos;