summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-17 18:32:47 +0200
committerBjörn Geiger2011-10-17 18:32:47 +0200
commit449b3319ca9cc66a27586d9a1d780b92e0454eec (patch)
tree37bf1f7b9f7c79b6304b998fb16d164edf3ad519
parentminor (diff)
downloadpoolctrl-449b3319ca9cc66a27586d9a1d780b92e0454eec.tar.gz
poolctrl-449b3319ca9cc66a27586d9a1d780b92e0454eec.tar.xz
poolctrl-449b3319ca9cc66a27586d9a1d780b92e0454eec.zip
Korrektur
-rwxr-xr-xapplication/controllers/EventController.php30
1 files changed, 16 insertions, 14 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 37d2925..cfdb240 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1558,12 +1558,25 @@ class EventController extends Zend_Controller_Action
}
$boot = false;
$shutdown = false;
+ switch($event->getCategory()) {
+ case $eventcategories['Boot']:
+ $boot = true;
+
+ break;
+
+ case $eventcategories['Shutdown']:
+ $shutdown = true;
+
+ break;
+ }
$runningEvents = $this->eventMapper->findBy(array('pbs_poolID' => $event->getPbs_PoolID(), 'running' => 1));
if(count($runningEvents) > 1) {
$updatePeriod = $this->config['event']['updatePeriod'];
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $updatePeriod * 60);
- $event->setStart($newStart);
- if($event->getEnd()) {
+ if($boot) {
+ $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $updatePeriod * 60);
+ $event->setStart($newStart);
+ }
+ if($shutdown) {
$newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $updatePeriod * 60);
$event->setEnd($newEnd);
}
@@ -1577,17 +1590,6 @@ class EventController extends Zend_Controller_Action
}
return;
}
- switch($event->getCategory()) {
- case $eventcategories['Boot']:
- $boot = true;
-
- break;
-
- case $eventcategories['Shutdown']:
- $shutdown = true;
-
- break;
- }
$runningtypeMapper = new Application_Model_RunningtypeMapper();
if($boot) {
$bootOsRequest = "bootosid=" . $event->getPbs_bootosID();