summaryrefslogtreecommitdiffstats
path: root/gearman/controllerWorker/ControllerWorker/StatusWorker.java
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-22 12:58:36 +0200
committerBjörn Geiger2011-08-22 12:58:36 +0200
commit0248e4f52c271a1374c228f70c45657612931800 (patch)
tree988ae59052b0e13fee20074509ba142a027a0c4c /gearman/controllerWorker/ControllerWorker/StatusWorker.java
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-0248e4f52c271a1374c228f70c45657612931800.tar.gz
poolctrl-0248e4f52c271a1374c228f70c45657612931800.tar.xz
poolctrl-0248e4f52c271a1374c228f70c45657612931800.zip
StatusWorker korrigiert
Diffstat (limited to 'gearman/controllerWorker/ControllerWorker/StatusWorker.java')
-rw-r--r--gearman/controllerWorker/ControllerWorker/StatusWorker.java24
1 files changed, 16 insertions, 8 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/StatusWorker.java b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
index bcf678d..9f1c114 100644
--- a/gearman/controllerWorker/ControllerWorker/StatusWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
@@ -40,13 +40,15 @@ public class StatusWorker extends AbstractGearmanFunction {
if (BOOTTHREADS.containsKey(event)) {
Vector<HashMap<String, String>> clients = boot.getClients();
if (boot.isFinished()) {
- content.put("result", "Booting of " + event
+ content.put("result", "succeeded");
+ content.put("resultText", "Booting of " + event
+ " has been finished!");
res.put(event, content);
BOOTTHREADS.remove(event);
boot = null;
} else if (boot.isFinishedWithErrors()) {
- content.put("result", "Booting of " + event
+ content.put("result", "failed");
+ content.put("resultText", "Booting of " + event
+ " has not been finished, due to errors!");
LinkedHashMap<String, String> clientErrors = new LinkedHashMap<String, String>();
for (HashMap<String, String> client : clients) {
@@ -59,7 +61,8 @@ public class StatusWorker extends AbstractGearmanFunction {
BOOTTHREADS.remove(event);
boot = null;
} else {
- content.put("result", "Booting of " + event
+ content.put("result", "not finished");
+ content.put("resultText", "Booting of " + event
+ " has not yet been finished!");
LinkedHashMap<String, String> clientStatus = new LinkedHashMap<String, String>();
for (HashMap<String, String> client : clients) {
@@ -71,8 +74,9 @@ public class StatusWorker extends AbstractGearmanFunction {
res.put(event, content);
}
} else {
+ content.put("result", "not found");
content
- .put("result",
+ .put("resultText",
"The Boot process for the event has not been found.");
res.put(event, content);
}
@@ -84,13 +88,15 @@ public class StatusWorker extends AbstractGearmanFunction {
Vector<HashMap<String, String>> clients = shutdown
.getClients();
if (shutdown.isFinished()) {
- content.put("result", "Shutdown of " + event
+ content.put("result", "succeeded");
+ content.put("resultText", "Shutdown of " + event
+ " has been finished!");
res.put(event, content);
SHUTDOWNTHREADS.remove(event);
shutdown = null;
} else if (shutdown.isFinishedWithErrors()) {
- content.put("result", "Shutdown of " + event
+ content.put("result", "failed");
+ content.put("resultText", "Shutdown of " + event
+ " has not been finished, due to errors!");
LinkedHashMap<String, String> clientErrors = new LinkedHashMap<String, String>();
for (HashMap<String, String> client : clients) {
@@ -103,7 +109,8 @@ public class StatusWorker extends AbstractGearmanFunction {
SHUTDOWNTHREADS.remove(event);
shutdown = null;
} else {
- content.put("result", "Shutdown of " + event
+ content.put("result", "not finished");
+ content.put("resultText", "Shutdown of " + event
+ " has not yet been finished!");
LinkedHashMap<String, String> clientStatus = new LinkedHashMap<String, String>();
for (HashMap<String, String> client : clients) {
@@ -115,8 +122,9 @@ public class StatusWorker extends AbstractGearmanFunction {
res.put(event, content);
}
} else {
+ content.put("result", "not found");
content
- .put("result",
+ .put("resultText",
"The Shutdown process for the event has not been found.");
res.put(event, content);
}