summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-14 11:34:31 +0200
committerBjörn Geiger2011-10-14 11:34:31 +0200
commit61b8a8ffef4452cb6f6065f46631868349268d3e (patch)
tree2edb949779879a17cc9b9ece8d85f1ad8d2631ca /gearman
parentBootos und config nicht bei Shutdown continued (diff)
downloadpoolctrl-61b8a8ffef4452cb6f6065f46631868349268d3e.tar.gz
poolctrl-61b8a8ffef4452cb6f6065f46631868349268d3e.tar.xz
poolctrl-61b8a8ffef4452cb6f6065f46631868349268d3e.zip
bootosCheck korrigiert
Diffstat (limited to 'gearman')
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 17a017f..bac42e1 100755
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -594,15 +594,11 @@ public class Boot extends Thread {
if (!result.isEmpty()) {
JSONObject resultObj = (JSONObject) JSONValue.parse(result);
if (!resultObj.containsKey("err")) {
- /*
- * String release = resultObj.get("Release").toString();
- * String distriputorID =
- * resultObj.get("Distributor ID").toString();
- */
- String description = resultObj.get("Description")
- .toString();
+ String clientBootOs = resultObj.get("Distributor ID")
+ .toString()
+ + " " + resultObj.get("Release").toString();
- if (description.equals(bootOS)) {
+ if (clientBootOs.equals(bootOS)) {
logger.info(client.getIp() + " right OS");
// right os, go to successState
client.setState(ClientState.BOOT_SUCCESS,