summaryrefslogtreecommitdiffstats
path: root/application/controllers/GearmanController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-23 13:19:00 +0200
committerBjörn Geiger2011-08-23 13:19:00 +0200
commit2f1682c5bd9b19993928896568c379667ca89053 (patch)
treeb636f0c043360102ce08a97ac96a35cf62184b4f /application/controllers/GearmanController.php
parentkleine Korrektur (diff)
downloadpoolctrl-2f1682c5bd9b19993928896568c379667ca89053.tar.gz
poolctrl-2f1682c5bd9b19993928896568c379667ca89053.tar.xz
poolctrl-2f1682c5bd9b19993928896568c379667ca89053.zip
Black und Whitelist nun in der Application.ini
Diffstat (limited to 'application/controllers/GearmanController.php')
-rw-r--r--application/controllers/GearmanController.php42
1 files changed, 6 insertions, 36 deletions
diff --git a/application/controllers/GearmanController.php b/application/controllers/GearmanController.php
index 8e022db..6c77511 100644
--- a/application/controllers/GearmanController.php
+++ b/application/controllers/GearmanController.php
@@ -107,18 +107,8 @@ class GearmanController extends Zend_Controller_Action
'waitTime' => $this->gearmanWorkerWaitTime,
'host' => $this->gearmanServerHost,
'port' => $this->gearmanServerPort,
- 'blacklist' => array(
- 0 => 'firefox-bin',
- 1 => 'chromium-browse',
- 2 => 'thunderbird-bi',
- 3 => 'evince',
- 4 => 'soffice.bin',
- 5 => 'eclipse',
- ),
- 'whitelist' => array(
- 0 => 'gnome-screensav',
- 1 => 'Kscreensaver',
- ),
+ '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'),
),
@@ -142,18 +132,8 @@ class GearmanController extends Zend_Controller_Action
'waitTime' => $this->gearmanWorkerWaitTime,
'host' => $this->gearmanServerHost,
'port' => $this->gearmanServerPort,
- 'blacklist' => array(
- 0 => 'firefox-bin',
- 1 => 'chromium-browse',
- 2 => 'thunderbird-bi',
- 3 => 'evince',
- 4 => 'soffice.bin',
- 5 => 'eclipse',
- ),
- 'whitelist' => array(
- 0 => 'gnome-screensav',
- 1 => 'Kscreensaver',
- ),
+ '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'),
),
@@ -177,18 +157,8 @@ class GearmanController extends Zend_Controller_Action
'waitTime' => $this->gearmanWorkerWaitTime,
'host' => $this->gearmanServerHost,
'port' => $this->gearmanServerPort,
- 'blacklist' => array(
- 0 => 'firefox-bin',
- 1 => 'chromium-browse',
- 2 => 'thunderbird-bi',
- 3 => 'evince',
- 4 => 'soffice.bin',
- 5 => 'eclipse',
- ),
- 'whitelist' => array(
- 0 => 'gnome-screensav',
- 1 => 'Kscreensaver',
- ),
+ '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'),