summaryrefslogtreecommitdiffstats
path: root/gearman/controllerWorker/ControllerWorker/StatusWorker.java
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-31 16:36:30 +0200
committerBjörn Geiger2011-08-31 16:36:30 +0200
commita48ca69d5dc7fd00b43c1678fc1d96c3274ab1f5 (patch)
treeb6767f5c8a596f805c256c5c7950b10edd607b16 /gearman/controllerWorker/ControllerWorker/StatusWorker.java
parentkleine änderung (diff)
downloadpoolctrl-a48ca69d5dc7fd00b43c1678fc1d96c3274ab1f5.tar.gz
poolctrl-a48ca69d5dc7fd00b43c1678fc1d96c3274ab1f5.tar.xz
poolctrl-a48ca69d5dc7fd00b43c1678fc1d96c3274ab1f5.zip
Client und State nun als eigenes Objekt, Shutdown.java noch nicht ganz angepasst
Diffstat (limited to 'gearman/controllerWorker/ControllerWorker/StatusWorker.java')
-rw-r--r--gearman/controllerWorker/ControllerWorker/StatusWorker.java35
1 files changed, 17 insertions, 18 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/StatusWorker.java b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
index dee1011..880b6aa 100644
--- a/gearman/controllerWorker/ControllerWorker/StatusWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
@@ -38,7 +38,7 @@ public class StatusWorker extends AbstractGearmanFunction {
for (String event : events) {
Boot boot = BOOTTHREADS.get(event);
if (BOOTTHREADS.containsKey(event)) {
- Vector<HashMap<String, String>> clients = boot.getClients();
+ Vector<Client> clients = boot.getClients();
if (boot.isFinished()) {
content.put("result shortcut", "succeeded");
content.put("result text", "Booting of " + event
@@ -51,9 +51,9 @@ public class StatusWorker extends AbstractGearmanFunction {
content.put("result text", "Booting of " + event
+ " has not been finished, due to errors!");
LinkedHashMap<String, String> clientErrors = new LinkedHashMap<String, String>();
- for (HashMap<String, String> client : clients) {
- String clientID = client.get("id");
- String errorText = boot.getError(client);
+ for (Client client : clients) {
+ String clientID = Integer.toString(client.getId());
+ String errorText = client.getError();
if (!errorText.isEmpty()) {
clientErrors.put(clientID, errorText);
}
@@ -67,12 +67,12 @@ public class StatusWorker extends AbstractGearmanFunction {
content.put("result text", "Booting of " + event
+ " has not yet been finished!");
LinkedHashMap<String, String> clientStatus = new LinkedHashMap<String, String>();
- for (HashMap<String, String> client : clients) {
- String clientID = client.get("id");
- String statusText = boot.getStatusText(client);
- clientStatus.put(clientID, statusText);
+ for (Client client : clients) {
+ String clientID = Integer.toString(client.getId());
+ String stateText = client.getStateText();
+ clientStatus.put(clientID, stateText);
}
- content.put("clients status", clientStatus);
+ content.put("clients states", clientStatus);
res.put(event, content);
}
} else {
@@ -87,8 +87,7 @@ public class StatusWorker extends AbstractGearmanFunction {
for (String event : events) {
if (SHUTDOWNTHREADS.containsKey(event)) {
Shutdown shutdown = SHUTDOWNTHREADS.get(event);
- Vector<HashMap<String, String>> clients = shutdown
- .getClients();
+ Vector<Client> clients = shutdown.getClients();
if (shutdown.isFinished()) {
content.put("result shortcut", "succeeded");
content.put("result text", "Shutdown of " + event
@@ -101,9 +100,9 @@ public class StatusWorker extends AbstractGearmanFunction {
content.put("result text", "Shutdown of " + event
+ " has not been finished, due to errors!");
LinkedHashMap<String, String> clientErrors = new LinkedHashMap<String, String>();
- for (HashMap<String, String> client : clients) {
- String clientID = client.get("id");
- String errorText = shutdown.getError(client);
+ for (Client client : clients) {
+ String clientID = Integer.toString(client.getId());
+ String errorText = client.getError();
if (!errorText.isEmpty()) {
clientErrors.put(clientID, errorText);
}
@@ -117,12 +116,12 @@ public class StatusWorker extends AbstractGearmanFunction {
content.put("result text", "Shutdown of " + event
+ " has not yet been finished!");
LinkedHashMap<String, String> clientStatus = new LinkedHashMap<String, String>();
- for (HashMap<String, String> client : clients) {
- String clientID = client.get("id");
- String statusText = shutdown.getStatusText(client);
+ for (Client client : clients) {
+ String clientID = Integer.toString(client.getId());
+ String statusText = client.getStateText();
clientStatus.put(clientID, statusText);
}
- content.put("clients status", clientStatus);
+ content.put("clients states", clientStatus);
res.put(event, content);
}
} else {