summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-24 16:08:52 +0200
committerBjörn Geiger2011-08-24 16:08:52 +0200
commitf8ef4ba4cd5cbd0d07c0cd0e679beffb751280f4 (patch)
tree7a038a4ed5cf23bfb932087263bfaef29a0bd1c9 /gearman
parentminor (diff)
downloadpoolctrl-f8ef4ba4cd5cbd0d07c0cd0e679beffb751280f4.tar.gz
poolctrl-f8ef4ba4cd5cbd0d07c0cd0e679beffb751280f4.tar.xz
poolctrl-f8ef4ba4cd5cbd0d07c0cd0e679beffb751280f4.zip
weitere Korrektur
Diffstat (limited to 'gearman')
-rw-r--r--gearman/controllerWorker/ControllerWorker/Boot.java28
-rw-r--r--gearman/controllerWorker/ControllerWorker/Shutdown.java27
2 files changed, 25 insertions, 30 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 33ca855..5a30796 100644
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -475,23 +475,19 @@ public class Boot extends Thread {
}
if (blacklistFound) {
- if (whitelistFound) {
- /*
- * System.out.println(ipAddress +
- * " is not working"); // is not working
- * status.put(clientID, 13);
- * psJobs.remove(clientID);
- */
- } else {
- System.out.println(ipAddress
- + " is working");
- status.put(clientID, 18); // is working
- psJobs.remove(clientID);
- }
- } else {
+ /*
+ * if (whitelistFound) {
+ * System.out.println(ipAddress +
+ * " is not working"); // is not working
+ * status.put(clientID, 13);
+ * psJobs.remove(clientID); } else {
+ */
System.out.println(ipAddress
- + " is not working");
- // is not working
+ + " is working");
+ status.put(clientID, 18); // is working
+ psJobs.remove(clientID);
+ // }
+ } else {
status.put(clientID, 13);
psJobs.remove(clientID);
}
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index d761217..03f42d0 100644
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -405,19 +405,18 @@ public class Shutdown extends Thread {
}
if (blacklistFound) {
- if (whitelistFound) {
- /*
- * System.out.println(ipAddress +
- * " is not working"); // is not working
- * status.put(clientID, 4);
- * psJobs.remove(clientID);
- */
- } else {
- System.out.println(ipAddress
- + " is working");
- status.put(clientID, 11); // is working
- psJobs.remove(clientID);
- }
+ /*
+ * if (whitelistFound) {
+ * System.out.println(ipAddress +
+ * " is not working"); // is not working
+ * status.put(clientID, 4);
+ * psJobs.remove(clientID);
+ *
+ * } else {
+ */
+ status.put(clientID, 11); // is working
+ psJobs.remove(clientID);
+ // }
} else {
System.out.println(ipAddress
+ " is not working");
@@ -475,7 +474,7 @@ public class Shutdown extends Thread {
boolean allFinished = false;
for (HashMap<String, String> client : clients) {
int clientID = Integer.parseInt(client.get("id"));
- boolean clientFinished = finishedClients.get(clientID);
+ boolean clientFinished = finishedClients.get(clientID);
if (clientFinished) {
allFinished = true;
} else {