summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/controllers/GearmanController.php2
-rw-r--r--gearman/controllerWorker/ControllerWorker/BootWorker.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/application/controllers/GearmanController.php b/application/controllers/GearmanController.php
index 608e88c..f6ce9fe 100644
--- a/application/controllers/GearmanController.php
+++ b/application/controllers/GearmanController.php
@@ -90,10 +90,12 @@ class GearmanController extends Zend_Controller_Action
public function bootAction() {
$eventName = 'test';
+ $eventOS = 'testOS';
$updateRate = 1;
$clients = array(
'eventName' => $eventName,
'updateRate' => $updateRate,
+ 'eventOS' => $eventOS,
'clients' => array(
0 => array('id' => '1', 'ip' =>'132.230.4.24', 'mac' =>'00:13:72:C7:FD:A1'), //PC im HiWi-Raum rechts auf dem Tisch
/* 1 => array('id' => '2', 'ip' =>'132.230.4.2', 'mac' =>''),
diff --git a/gearman/controllerWorker/ControllerWorker/BootWorker.java b/gearman/controllerWorker/ControllerWorker/BootWorker.java
index 1600b87..6bb2365 100644
--- a/gearman/controllerWorker/ControllerWorker/BootWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/BootWorker.java
@@ -24,7 +24,7 @@ public class BootWorker extends AbstractGearmanFunction {
Vector<HashMap<String, String>> clients = new Vector<HashMap<String, String>>();
JSONObject jsonObject = (JSONObject) JSONValue.parse(data);
String event = jsonObject.get("eventName").toString();
- String eventOS = jsonObject.get("eventBootOS").toString();
+ String eventOS = jsonObject.get("eventOS").toString();
int updateRate = Integer.parseInt(jsonObject.get("updateRate")
.toString());
JSONArray jsonArray = (JSONArray) jsonObject.get("clients");