summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorBjörn Geiger2011-07-21 17:55:38 +0200
committerBjörn Geiger2011-07-21 17:55:38 +0200
commit77f3780a6593b4396223d5aa49e04f89eb89f083 (patch)
tree7b6c3e5bf1cd8375e746c388d78bba4d29f2fa6b /gearman
parentautentification in gearmantestview added (diff)
downloadpoolctrl-77f3780a6593b4396223d5aa49e04f89eb89f083.tar.gz
poolctrl-77f3780a6593b4396223d5aa49e04f89eb89f083.tar.xz
poolctrl-77f3780a6593b4396223d5aa49e04f89eb89f083.zip
minor
Diffstat (limited to 'gearman')
-rw-r--r--gearman/java/ControllerWorker/Boot.java16
-rw-r--r--gearman/java/ControllerWorker/BootWorker.java5
2 files changed, 8 insertions, 13 deletions
diff --git a/gearman/java/ControllerWorker/Boot.java b/gearman/java/ControllerWorker/Boot.java
index 7a61279..b0aea62 100644
--- a/gearman/java/ControllerWorker/Boot.java
+++ b/gearman/java/ControllerWorker/Boot.java
@@ -79,7 +79,7 @@ public class Boot extends Thread {
break;
case 1:
GearmanJob pingJob = PING_JOBS.get(clientID);
- if (!gearmanClient.getJobStatus(pingJob).isKnown()) {
+ if (gearmanClient.getJobStatus(pingJob).isKnown()) {
if (!gearmanClient.getJobStatus(pingJob).isRunning()) {
GearmanJobResult pingJobRes = pingJob.get();
String result = ByteUtils.fromUTF8Bytes(pingJobRes
@@ -100,7 +100,7 @@ public class Boot extends Thread {
}
}
} else {
- PING_JOBS.remove(clientID);
+ // PING_JOBS.remove(clientID);
}
break;
case 2:
@@ -111,7 +111,7 @@ public class Boot extends Thread {
break;
case 4:
GearmanJob wolJob = WOL_JOBS.get(clientID);
- if (!gearmanClient.getJobStatus(wolJob).isKnown()) {
+ if (gearmanClient.getJobStatus(wolJob).isKnown()) {
if (!gearmanClient.getJobStatus(wolJob).isRunning()) {
GearmanJobResult wolJobRes = wolJob.get();
String result = ByteUtils.fromUTF8Bytes(wolJobRes
@@ -119,14 +119,12 @@ public class Boot extends Thread {
if (result == "Magic packet send.") {
System.out
.println(macAddress + "Magic packet send");
- STATUS.put(clientID, 5); // magic
- // packet
- // send
+ STATUS.put(clientID, 5); // magic packet send
WOL_JOBS.remove(clientID);
}
}
} else {
- WOL_JOBS.remove(clientID);
+ // WOL_JOBS.remove(clientID);
}
break;
case 5:
@@ -153,7 +151,7 @@ public class Boot extends Thread {
int clientID = Integer.parseInt(client.get("id"));
GearmanJob job = GearmanJobImpl.createJob("wol", macAddress.getBytes(),
"wol" + clientID);
- STATUS.put(clientID, 4); // wake on lan started //
+ STATUS.put(clientID, 4); // wake on lan started
gearmanClient.submit(job);
WOL_JOBS.put(clientID, job);
System.out.println("wake on lan " + macAddress);
@@ -164,7 +162,7 @@ public class Boot extends Thread {
int clientID = Integer.parseInt(client.get("id"));
GearmanJob job = GearmanJobImpl.createJob("ssh", ipAddress.getBytes(),
"ssh" + clientID);
- STATUS.put(clientID, 6); // ssh started //
+ STATUS.put(clientID, 6); // ssh started
gearmanClient.submit(job);
SSH_JOBS.put(clientID, job);
System.out.println("ssh " + ipAddress);
diff --git a/gearman/java/ControllerWorker/BootWorker.java b/gearman/java/ControllerWorker/BootWorker.java
index 09adedd..1c909eb 100644
--- a/gearman/java/ControllerWorker/BootWorker.java
+++ b/gearman/java/ControllerWorker/BootWorker.java
@@ -24,16 +24,13 @@ public class BootWorker extends AbstractGearmanFunction {
Vector<HashMap<String, String>> clients = new Vector<HashMap<String, String>>();
JSONArray jsonArray = (JSONArray) JSONValue.parse(data);
- int count = 0;
-
for (Object clientObj : jsonArray) {
JSONObject clientJsonObj = (JSONObject) clientObj;
HashMap<String, String> clientMap = new HashMap<String, String>();
- clientMap.put("id", Integer.toString(count));
+ clientMap.put("id", clientJsonObj.get("id").toString());
clientMap.put("ip", clientJsonObj.get("ip").toString());
clientMap.put("mac", clientJsonObj.get("mac").toString());
clients.add(clientMap);
- count++;
}
Boot boot = new Boot("127.0.0.1", 4730, clients);