summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-12 14:05:59 +0200
committerBjörn Geiger2011-09-12 14:05:59 +0200
commit6550267106ac24a57df2b32e2d1bb50edfa68ec8 (patch)
tree4b24da66fa96df17ca79286c07159bac0f9ebd7c /application
parentminor (diff)
downloadpoolctrl-6550267106ac24a57df2b32e2d1bb50edfa68ec8.tar.gz
poolctrl-6550267106ac24a57df2b32e2d1bb50edfa68ec8.tar.xz
poolctrl-6550267106ac24a57df2b32e2d1bb50edfa68ec8.zip
verschiedene Korrekturen
Diffstat (limited to 'application')
-rwxr-xr-xapplication/configs/application.ini.dist16
-rwxr-xr-xapplication/controllers/EventController.php12
-rwxr-xr-xapplication/controllers/GearmanController.php24
3 files changed, 2 insertions, 50 deletions
diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist
index 27b5ad5..9919ae7 100755
--- a/application/configs/application.ini.dist
+++ b/application/configs/application.ini.dist
@@ -35,24 +35,12 @@ pbs2.getrole = /resource/getrole/apikey/
poolctrl.host =
poolctrl.runevent = /event/run/apikey/apikey1
poolctrl.reportevent = /event/report/apikey/apikey1
-
gearman.server.host =
gearman.server.port =
gearman.worker.waitTime = 120
gearman.worker.updateRate = 1
-gearman.worker.ps.blacklist.0 = firefox-bin
-gearman.worker.ps.blacklist.1 = chromium-browse
-gearman.worker.ps.blacklist.2 = thunderbird-bi
-gearman.worker.ps.blacklist.3 = evince
-gearman.worker.ps.blacklist.4 = soffice.bin
-gearman.worker.ps.blacklist.5 = eclipse
-gearman.worker.ps.blacklist.6 = acroread
-gearman.worker.ps.blacklist.7 = libreoffice
-gearman.worker.ps.blacklist.8 = vmplayer-daemo
-gearman.worker.ps.blacklist.9 = vmware-unity-he
-gearman.worker.ps.blacklist.10 = vmware-vmx
-gearman.worker.ps.whitelist.0 = gnome-screensav
-gearman.worker.ps.whitelist.1 = Kscreensaver
+gearman.worker.ps.blacklist = firefox-bin, chromium-browse, thunderbird-bi, evince, soffice.bin, eclipse
+gearman.worker.ps.whitelist = gnome-screensav, Kscreensaver
event.updatePeriod = 5
event.category.default = Lecture
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 0263d91..3dfca3d 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -732,12 +732,6 @@ class EventController extends Zend_Controller_Action
if($run) {
$data = array(
'eventName' => $event->getTitle(),
- 'updateRate' => $this->gearmanWorkerUpdateRate,
- 'waitTime' => $this->gearmanWorkerWaitTime,
- 'gearmanServerHost' => $this->gearmanServerHost,
- 'gearmanServerPort' => $this->gearmanServerPort,
- 'blacklist' => $this->config['gearman']['worker']['ps']['blacklist'],
- 'whitelist' => $this->config['gearman']['worker']['ps']['whitelist'],
);
$poolRequest = "poolid=" . $event->getPbs_poolID();
$this->config['pbs2']['getpools'];
@@ -1012,12 +1006,6 @@ class EventController extends Zend_Controller_Action
private function runEvent(Application_Model_Event $event) {
$data = array(
'eventName' => $event->getTitle(),
- 'updateRate' => $this->gearmanWorkerUpdateRate,
- 'waitTime' => $this->gearmanWorkerWaitTime,
- 'gearmanServerHost' => $this->gearmanServerHost,
- 'gearmanServerPort' => $this->gearmanServerPort,
- 'blacklist' => $this->config['gearman']['worker']['ps']['blacklist'],
- 'whitelist' => $this->config['gearman']['worker']['ps']['whitelist'],
);
$poolRequest = "poolid=" . $event->getPbs_poolID();
$this->config['pbs2']['getpools'];
diff --git a/application/controllers/GearmanController.php b/application/controllers/GearmanController.php
index b4b8f6c..5882add 100755
--- a/application/controllers/GearmanController.php
+++ b/application/controllers/GearmanController.php
@@ -8,9 +8,6 @@ class GearmanController extends Zend_Controller_Action
protected $acl;
protected $gearmanClient;
protected $gearmanServerHost;
- protected $gearmanServerPort;
- protected $gearmanWorkerUpdateRate;
- protected $gearmanWorkerWaitTime;
public function init()
{
@@ -26,10 +23,7 @@ class GearmanController extends Zend_Controller_Action
header('HTTP/1.0 403 No Right to run events');
die();
}
- $this->gearmanServerPort = $this->config['gearman']['server']['port'];
$this->gearmanServerHost = $this->config['gearman']['server']['host'];
- $this->gearmanWorkerWaitTime = $this->config['gearman']['worker']['waitTime'];
- $this->gearmanWorkerUpdateRate = $this->config['gearman']['worker']['updateRate'];
$this->gearmanClient = new GearmanClient();
$this->gearmanClient->addServer($this->gearmanServerHost);
} else {
@@ -106,12 +100,6 @@ class GearmanController extends Zend_Controller_Action
$data = array(
'eventName' => $eventName,
'eventOS' => $eventOS,
- 'updateRate' => $this->gearmanWorkerUpdateRate,
- 'waitTime' => $this->gearmanWorkerWaitTime,
- 'gearmanServerHost' => $this->gearmanServerHost,
- 'gearmanServerPort' => $this->gearmanServerPort,
- 'blacklist' => $this->config['gearman']['worker']['ps']['blacklist'],
- 'whitelist' => $this->config['gearman']['worker']['ps']['whitelist'],
'clients' => array(
0 => array('id' => '1', 'ip' =>'132.230.4.24', 'mac' =>'00:13:72:C7:FD:A1'),
),
@@ -131,12 +119,6 @@ class GearmanController extends Zend_Controller_Action
$eventName = 'shutdownTest';
$data = array(
'eventName' => $eventName,
- 'updateRate' => $this->gearmanWorkerUpdateRate,
- 'waitTime' => $this->gearmanWorkerWaitTime,
- 'gearmanServerHost' => $this->gearmanServerHost,
- 'gearmanServerPort' => $this->gearmanServerPort,
- 'blacklist' => $this->config['gearman']['worker']['ps']['blacklist'],
- 'whitelist' => $this->config['gearman']['worker']['ps']['whitelist'],
'clients' => array(
0 => array('id' => '1', 'ip' =>'132.230.4.24', 'mac' =>'00:13:72:C7:FD:A1'),
),
@@ -156,12 +138,6 @@ class GearmanController extends Zend_Controller_Action
$eventName = 'maintenance_pool-113'; //maintenance of pool-113
$data = array(
'eventName' => $eventName,
- 'updateRate' => $this->gearmanWorkerUpdateRate,
- 'waitTime' => $this->gearmanWorkerWaitTime,
- 'gearmanServerHost' => $this->gearmanServerHost,
- 'gearmanServerPort' => $this->gearmanServerPort,
- 'blacklist' => $this->config['gearman']['worker']['ps']['blacklist'],
- 'whitelist' => $this->config['gearman']['worker']['ps']['whitelist'],
'clients' => array(
0 => array('id' => '1', 'ip' =>'132.230.4.121', 'mac' =>'00:1e:0b:a6:f8:19'),
0 => array('id' => '2', 'ip' =>'132.230.4.122', 'mac' =>'00:1e:0b:a6:d5:de'),