summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-17 17:05:56 +0200
committerBjörn Geiger2011-10-17 17:05:56 +0200
commit3491a1b73228cdf09300c97a6cf46c959d63f716 (patch)
treebd5856592163104b293d2ca72eda91318a768f02
parentsome changes (diff)
downloadpoolctrl-3491a1b73228cdf09300c97a6cf46c959d63f716.tar.gz
poolctrl-3491a1b73228cdf09300c97a6cf46c959d63f716.tar.xz
poolctrl-3491a1b73228cdf09300c97a6cf46c959d63f716.zip
kleine Korrektur
-rwxr-xr-x.gitignore1
-rwxr-xr-xapplication/controllers/EventController.php38
2 files changed, 21 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index 9c9150e..4a65cbf 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ library/Zend/
gearman/controllerWorker/bin/
application/configs/application.ini
scripts/macPool-113.txt
+scripts/macPool-114.txt
resources/
*.class
*.log
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 9d9a26d..444ad13 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1091,24 +1091,6 @@ class EventController extends Zend_Controller_Action
if($event->getRunning()) {
continue;
}
- $runningEvents = $this->eventMapper->findBy(array('pbs_poolID' => $event->getPbs_PoolID(), 'running' => 1));
- if(count($runningEvents) > 0) {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $updatePeriod * 60);
- $event->setStart($newStart);
- if($event->getEnd()) {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $updatePeriod * 60);
- $event->setEnd($newEnd);
- }
- try {
- $this->eventMapper->save($event);
- } catch(Zend_Exception $e)
- {
- echo "Caught exception: " . get_class($e) . "<br/>";
- echo "Message: " . $e->getMessage() . "<br/>";
- return;
- }
- continue;
- }
switch($event->getCategory()) {
case $eventcategories['Boot']:
if($eventStart >= $startTime && $eventStart <= $endTime) {
@@ -1142,6 +1124,26 @@ class EventController extends Zend_Controller_Action
break;
}
if($run) {
+ $runningEvents = $this->eventMapper->findBy(array('pbs_poolID' => $event->getPbs_PoolID(), 'running' => 1));
+ if(count($runningEvents) > 0) {
+ 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);
+ }
+ try {
+ $this->eventMapper->save($event);
+ } catch(Zend_Exception $e)
+ {
+ echo "Caught exception: " . get_class($e) . "<br/>";
+ echo "Message: " . $e->getMessage() . "<br/>";
+ return;
+ }
+ continue;
+ }
$data = array(
'eventName' => $event->getTitle(),
);