summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-21 14:28:54 +0200
committerBjörn Geiger2011-09-21 14:28:54 +0200
commit24025bbcd2b3d27b3faaee838be7d65e69189451 (patch)
tree2fada98cd40443f8ab353deb97492b14fe73988b /application
parentrm getpoolselectboxval (diff)
downloadpoolctrl-24025bbcd2b3d27b3faaee838be7d65e69189451.tar.gz
poolctrl-24025bbcd2b3d27b3faaee838be7d65e69189451.tar.xz
poolctrl-24025bbcd2b3d27b3faaee838be7d65e69189451.zip
StatusWorker überarbeitet, noch nicht getestet
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php78
-rwxr-xr-xapplication/controllers/GearmanController.php4
2 files changed, 42 insertions, 40 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 8b982bf..29b846a 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -855,7 +855,7 @@ class EventController extends Zend_Controller_Action
if(count($eventBootNames) > 0) {
$data = array(
- 'type' => 'boot',
+ 'type' => 'getBootState',
'events' => $eventBootNames,
);
@@ -868,12 +868,43 @@ class EventController extends Zend_Controller_Action
}
$bootResultDecode = json_decode($bootResult);
$results['boot results'] = $bootResultDecode;
- foreach($bootResultDecode as $k => $eventResult) {
+ if(count($bootResultDecode) > 0) {
+ foreach($bootResultDecode as $k => $eventResult) {
- $eventResult->$resultShortcutName = sprintf('%s', $eventResult->$resultShortcutName);
- if($eventResult->$resultShortcutName == "not finished") {
- continue;
- } else if($eventResult->$resultShortcutName == 'not founded') {
+ $eventResult->$resultShortcutName = sprintf('%s', $eventResult->$resultShortcutName);
+ if($eventResult->$resultShortcutName == "not finished") {
+ continue;
+ } else if($eventResult->$resultShortcutName == 'not founded') {
+ $event->setRunning(false);
+ $event->setRunningtype(null);
+ try {
+ $this->eventMapper->save($event);
+ } catch(Zend_Exception $e)
+ {
+ echo "Caught exception: " . get_class($e) . "<br/>";
+ echo "Message: " . $e->getMessage() . "<br/>";
+ return;
+ }
+ continue;
+ }
+ $result = $this->eventMapper->findBy(array("title" => $k));
+ $event = $result[0];
+ $eventreport = new Application_Model_Eventreport();
+ $eventreport->setEventID($event->getID());
+ $eventreport->setResult($eventResult->$resultShortcutName);
+ $eventreport->setCreated(time());
+ if($eventResult->$resultShortcutName == "failed") {
+ $eventreport->setErrors(json_encode($eventResult->$errorsName));
+ }
+ $eventreport->setType($eventtypeBoot->getID());
+ try {
+ $eventreportMapper->save($eventreport);
+ } catch(Zend_Exception $e)
+ {
+ echo "Caught exception: " . get_class($e) . "<br/>";
+ echo "Message: " . $e->getMessage() . "<br/>";
+ return;
+ }
$event->setRunning(false);
$event->setRunningtype(null);
try {
@@ -884,42 +915,13 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- continue;
- }
- $result = $this->eventMapper->findBy(array("title" => $k));
- $event = $result[0];
- $eventreport = new Application_Model_Eventreport();
- $eventreport->setEventID($event->getID());
- $eventreport->setResult($eventResult->$resultShortcutName);
- $eventreport->setCreated(time());
- if($eventResult->$resultShortcutName == "failed") {
- $eventreport->setErrors(json_encode($eventResult->$errorsName));
- }
- $eventreport->setType($eventtypeBoot->getID());
- try {
- $eventreportMapper->save($eventreport);
- } catch(Zend_Exception $e)
- {
- echo "Caught exception: " . get_class($e) . "<br/>";
- echo "Message: " . $e->getMessage() . "<br/>";
- return;
- }
- $event->setRunning(false);
- $event->setRunningtype(null);
- try {
- $this->eventMapper->save($event);
- } catch(Zend_Exception $e)
- {
- echo "Caught exception: " . get_class($e) . "<br/>";
- echo "Message: " . $e->getMessage() . "<br/>";
- return;
}
}
}
if(count($eventShutdownNames) > 0) {
$data = array(
- 'type' => 'shutdown',
+ 'type' => 'getShutdownState',
'events' => $eventShutdownNames,
);
@@ -1212,7 +1214,7 @@ class EventController extends Zend_Controller_Action
$eventtypeMapper = new Application_Model_EventtypeMapper();
if($boot) {
$data = array(
- 'type' => 'boot',
+ 'type' => 'getBootState',
'events' => $event->getTitle(),
);
@@ -1269,7 +1271,7 @@ class EventController extends Zend_Controller_Action
}
} else if($shutdown) {
$data = array(
- 'type' => 'shutdown',
+ 'type' => 'getShutdownState',
'events' => $event->getTitle(),
);
diff --git a/application/controllers/GearmanController.php b/application/controllers/GearmanController.php
index 5882add..b44de8b 100755
--- a/application/controllers/GearmanController.php
+++ b/application/controllers/GearmanController.php
@@ -170,7 +170,7 @@ class GearmanController extends Zend_Controller_Action
public function checkbootstatusAction() {
$eventName = 'bootTest';
$data = array(
- 'type' => 'boot',
+ 'type' => 'getBootState',
'events' => array(
0 => $eventName,
),
@@ -189,7 +189,7 @@ class GearmanController extends Zend_Controller_Action
public function checkshutdownstatusAction() {
$eventName = 'shutdownTest';
$data = array(
- 'type' => 'shutdown',
+ 'type' => 'getShutdownState',
'events' => array(
0 => $eventName,
),