summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xapplication/controllers/EventController.php4
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java12
2 files changed, 6 insertions, 10 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index c60ce69..ff8bfee 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1193,7 +1193,7 @@ class EventController extends Zend_Controller_Action
$bootos->setSource(sprintf("%s", $bootosNew->source));
$bootos->setTitle(sprintf("%s", $bootosNew->title));
}
- $data['eventOS'] = $bootos->getTitle();
+ $data['eventOS'] = $bootos->getDistro() . " " . $bootos->getDistroversion();
}
$dataString = json_encode($data);
$result = $this->gearmanClient->do("boot", $dataString, 'boot' . $event->getTitle());
@@ -1601,7 +1601,7 @@ class EventController extends Zend_Controller_Action
$bootos->setSource(sprintf("%s", $bootosNew->source));
$bootos->setTitle(sprintf("%s", $bootosNew->title));
}
- $data['eventOS'] = $bootos->getTitle();
+ $data['eventOS'] = $bootos->getDistro() . " " . $bootos->getDistroversion();
}
$dataString = json_encode($data);
$result = $this->gearmanClient->do("boot", $dataString, 'boot' . $event->getTitle());
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,