From 0248e4f52c271a1374c228f70c45657612931800 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Mon, 22 Aug 2011 12:58:36 +0200 Subject: StatusWorker korrigiert --- .../ControllerWorker/StatusWorker.java | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'gearman/controllerWorker/ControllerWorker') 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> 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 clientErrors = new LinkedHashMap(); for (HashMap 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 clientStatus = new LinkedHashMap(); for (HashMap 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> 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 clientErrors = new LinkedHashMap(); for (HashMap 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 clientStatus = new LinkedHashMap(); for (HashMap 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); } -- cgit v1.2.3-55-g7522