summaryrefslogtreecommitdiffstats
path: root/gearman/java/ControllerWorker/Boot.java
diff options
context:
space:
mode:
authorBjörn Geiger2011-07-21 18:06:34 +0200
committerBjörn Geiger2011-07-21 18:06:34 +0200
commitf39ec6ea5a726ac5fa2cd66868c748ff8ae01959 (patch)
treee069b1567b0cf1c64f5242a458ae555d02c5d7c0 /gearman/java/ControllerWorker/Boot.java
parentClientIDs werden nun vom GearmanController übergeben (diff)
downloadpoolctrl-f39ec6ea5a726ac5fa2cd66868c748ff8ae01959.tar.gz
poolctrl-f39ec6ea5a726ac5fa2cd66868c748ff8ae01959.tar.xz
poolctrl-f39ec6ea5a726ac5fa2cd66868c748ff8ae01959.zip
minor
Diffstat (limited to 'gearman/java/ControllerWorker/Boot.java')
-rw-r--r--gearman/java/ControllerWorker/Boot.java68
1 files changed, 37 insertions, 31 deletions
diff --git a/gearman/java/ControllerWorker/Boot.java b/gearman/java/ControllerWorker/Boot.java
index b0aea62..70d8540 100644
--- a/gearman/java/ControllerWorker/Boot.java
+++ b/gearman/java/ControllerWorker/Boot.java
@@ -79,28 +79,32 @@ public class Boot extends Thread {
break;
case 1:
GearmanJob pingJob = PING_JOBS.get(clientID);
- if (gearmanClient.getJobStatus(pingJob).isKnown()) {
- if (!gearmanClient.getJobStatus(pingJob).isRunning()) {
- GearmanJobResult pingJobRes = pingJob.get();
- String result = ByteUtils.fromUTF8Bytes(pingJobRes
- .getResults());
- if (result != "") {
- JSONObject resultObj = (JSONObject) JSONValue
- .parse(result);
- String alive = resultObj.get("alive").toString();
- if (alive == "true") {
- System.out.println(ipAddress + " alive");
- STATUS.put(clientID, 2); // alive
- PING_JOBS.remove(clientID);
- } else {
- System.out.println(ipAddress + " not alive");
- STATUS.put(clientID, 3); // not alive
- PING_JOBS.remove(clientID);
+ if (pingJob != null) {
+ if (gearmanClient.getJobStatus(pingJob).isKnown()) {
+ if (!gearmanClient.getJobStatus(pingJob).isRunning()) {
+ GearmanJobResult pingJobRes = pingJob.get();
+ String result = ByteUtils.fromUTF8Bytes(pingJobRes
+ .getResults());
+ if (result != "") {
+ JSONObject resultObj = (JSONObject) JSONValue
+ .parse(result);
+ String alive = resultObj.get("alive")
+ .toString();
+ if (alive == "true") {
+ System.out.println(ipAddress + " alive");
+ STATUS.put(clientID, 2); // alive
+ PING_JOBS.remove(clientID);
+ } else {
+ System.out
+ .println(ipAddress + " not alive");
+ STATUS.put(clientID, 3); // not alive
+ PING_JOBS.remove(clientID);
+ }
}
}
+ } else {
+ // PING_JOBS.remove(clientID);
}
- } else {
- // PING_JOBS.remove(clientID);
}
break;
case 2:
@@ -111,20 +115,22 @@ public class Boot extends Thread {
break;
case 4:
GearmanJob wolJob = WOL_JOBS.get(clientID);
- if (gearmanClient.getJobStatus(wolJob).isKnown()) {
- if (!gearmanClient.getJobStatus(wolJob).isRunning()) {
- GearmanJobResult wolJobRes = wolJob.get();
- String result = ByteUtils.fromUTF8Bytes(wolJobRes
- .getResults());
- if (result == "Magic packet send.") {
- System.out
- .println(macAddress + "Magic packet send");
- STATUS.put(clientID, 5); // magic packet send
- WOL_JOBS.remove(clientID);
+ if (wolJob != null) {
+ if (gearmanClient.getJobStatus(wolJob).isKnown()) {
+ if (!gearmanClient.getJobStatus(wolJob).isRunning()) {
+ GearmanJobResult wolJobRes = wolJob.get();
+ String result = ByteUtils.fromUTF8Bytes(wolJobRes
+ .getResults());
+ if (result == "Magic packet send.") {
+ System.out.println(macAddress
+ + "Magic packet send");
+ STATUS.put(clientID, 5); // magic packet send
+ WOL_JOBS.remove(clientID);
+ }
}
+ } else {
+ // WOL_JOBS.remove(clientID);
}
- } else {
- // WOL_JOBS.remove(clientID);
}
break;
case 5: