summaryrefslogtreecommitdiffstats
path: root/gearman/controllerWorker/ControllerWorker/Shutdown.java
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-16 17:10:05 +0200
committerBjörn Geiger2011-08-16 17:10:05 +0200
commit3b46f80820e52c1babb8ba8c5b312064b5a92ad1 (patch)
tree4c68b427d7295c4e10bc012d04e4598a89c53cf3 /gearman/controllerWorker/ControllerWorker/Shutdown.java
parentminor (diff)
downloadpoolctrl-3b46f80820e52c1babb8ba8c5b312064b5a92ad1.tar.gz
poolctrl-3b46f80820e52c1babb8ba8c5b312064b5a92ad1.tar.xz
poolctrl-3b46f80820e52c1babb8ba8c5b312064b5a92ad1.zip
minor
Diffstat (limited to 'gearman/controllerWorker/ControllerWorker/Shutdown.java')
-rw-r--r--gearman/controllerWorker/ControllerWorker/Shutdown.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index 9961ff7..3c0dca9 100644
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -137,7 +137,7 @@ public class Shutdown extends Thread {
status.put(clientID, 2); // alive, check
// Users
pingJobs.remove(clientID);
- } else {
+ } else if (alive.equals("false")) {
System.out
.println(ipAddress + " not alive");
// not alive, go in successState
@@ -306,7 +306,7 @@ public class Shutdown extends Thread {
// alive, ping again
status.put(clientID, 7);
pingShutdownJobs.remove(clientID);
- } else {
+ } else if (alive.equals("false")) {
System.out
.println("not alive after shutdown"
+ ipAddress);
@@ -361,10 +361,10 @@ public class Shutdown extends Thread {
JSONObject resultObj = (JSONObject) JSONValue
.parse(result);
if (!resultObj.containsKey("err")) {
- String rawoutput = resultObj.get("rawoutput")
- .toString();
- System.out.println(rawoutput);
- if (rawoutput.equals("is working")) {
+ String ps = resultObj.get("ps").toString();
+ System.out.println(ps);
+ boolean isWorking = true;
+ if (isWorking) {
System.out.println(ipAddress
+ " is working");
status.put(clientID, 11); // is working