summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-09 17:37:03 +0200
committerBjörn Geiger2011-08-09 17:37:03 +0200
commit5ccfc04815ee1ece626fec93a67c51eccd0a1f03 (patch)
tree7edaab717f992c0d323f1049b311e2ca3e580491
parentminor (diff)
downloadpoolctrl-5ccfc04815ee1ece626fec93a67c51eccd0a1f03.tar.gz
poolctrl-5ccfc04815ee1ece626fec93a67c51eccd0a1f03.tar.xz
poolctrl-5ccfc04815ee1ece626fec93a67c51eccd0a1f03.zip
verschiedene Änderungen
-rw-r--r--.gitignore1
-rwxr-xr-x[-rw-r--r--]gearman/osWorker.py0
-rwxr-xr-xgearman/pingWorker.py1
-rwxr-xr-x[-rw-r--r--]gearman/restartWorker.py0
-rwxr-xr-x[-rw-r--r--]gearman/shutdownWorker.py0
-rwxr-xr-x[-rw-r--r--]gearman/whoWorker.py0
-rwxr-xr-x[-rw-r--r--]gearman/wolWorker.py3
-rwxr-xr-x[-rw-r--r--]gearman/wolWorker.py.html0
-rwxr-xr-xgearman/worker.sh7
-rw-r--r--setup/poolctrl.sql31
-rw-r--r--setup/poolctrl_data.sql14
11 files changed, 9 insertions, 48 deletions
diff --git a/.gitignore b/.gitignore
index 460f0ad..e4df8ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,6 @@ gearman/controllerWorker/bin/
application/configs/application.ini
resources/
*.class
+*.log
.zfproject.xml
diff --git a/gearman/osWorker.py b/gearman/osWorker.py
index 94077d9..94077d9 100644..100755
--- a/gearman/osWorker.py
+++ b/gearman/osWorker.py
diff --git a/gearman/pingWorker.py b/gearman/pingWorker.py
index fa13602..f7537e5 100755
--- a/gearman/pingWorker.py
+++ b/gearman/pingWorker.py
@@ -40,5 +40,4 @@ def pingTask(worker, job):
worker = GearmanWorker(["127.0.0.1"])
worker.register_task('ping', pingTask)
-print 'Starting gearman ping worker'
worker.work()
diff --git a/gearman/restartWorker.py b/gearman/restartWorker.py
index f449c19..f449c19 100644..100755
--- a/gearman/restartWorker.py
+++ b/gearman/restartWorker.py
diff --git a/gearman/shutdownWorker.py b/gearman/shutdownWorker.py
index d73a0bd..d73a0bd 100644..100755
--- a/gearman/shutdownWorker.py
+++ b/gearman/shutdownWorker.py
diff --git a/gearman/whoWorker.py b/gearman/whoWorker.py
index f9694f3..f9694f3 100644..100755
--- a/gearman/whoWorker.py
+++ b/gearman/whoWorker.py
diff --git a/gearman/wolWorker.py b/gearman/wolWorker.py
index be0fca2..3d5eb4c 100644..100755
--- a/gearman/wolWorker.py
+++ b/gearman/wolWorker.py
@@ -38,5 +38,4 @@ def wolTask(worker, job):
worker = GearmanWorker(["127.0.0.1"])
worker.register_task('wol', wolTask)
-print 'starting wol worker'
-worker.work() \ No newline at end of file
+worker.work()
diff --git a/gearman/wolWorker.py.html b/gearman/wolWorker.py.html
index 0c5de3f..0c5de3f 100644..100755
--- a/gearman/wolWorker.py.html
+++ b/gearman/wolWorker.py.html
diff --git a/gearman/worker.sh b/gearman/worker.sh
new file mode 100755
index 0000000..b68aca0
--- /dev/null
+++ b/gearman/worker.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+./pingWorker.py >> pingWorker.log 2>&1 |
+./restartWorker.py >> restartWorker.log 2>&1 |
+./whoWorker.py >> whoWorker.log 2>&1 |
+./wolWorker.py >> wolWorker.log 2>&1 |
+./osWorker.py >> osWorker.log 2>&1 |
+./shutdownWorker.py >> shutdownWorker.log 2>&1
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index 8dc176f..975d4c7 100644
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -46,35 +46,6 @@ CREATE TABLE IF NOT EXISTS `poolctrl_eventcategory` (
-- PBS2 Tabellen
-- TO DO: Tabellen an dieser Stelle nicht per Hand erzeugen sondern von der PBS2-Datenbank kopieren, sodass diese auf dem neusten Stand sind
-
-CREATE TABLE IF NOT EXISTS `pbs_filter` (
- `filterID` int(11) NOT NULL AUTO_INCREMENT,
- `membershipID` int(11),
- `groupID` int(11),
- `bootmenuID` int(11) NOT NULL,
- `title` varchar(30) NOT NULL,
- `description` varchar(140),
- `created` varchar(14) NOT NULL,
- `priority` int(11) NOT NULL,
- PRIMARY KEY (`filterID`),
- KEY `bootmenuID` (`bootmenuID`),
- KEY `groupID` (`groupID`),
- KEY `membershipID` (`membershipID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-
-CREATE TABLE IF NOT EXISTS `pbs_bootmenu` (
- `bootmenuID` int(11) NOT NULL AUTO_INCREMENT,
- `membershipID` int(11),
- `groupID` int(11),
- `title` varchar(50) NOT NULL,
- `created` varchar(14) NOT NULL,
- `defaultbootmenu` tinyint(1) NOT NULL DEFAULT '0',
- `startcounter` INT( 11 ) NOT NULL DEFAULT '300',
- PRIMARY KEY (`bootmenuID`),
- KEY `groupID` (`groupID`),
- KEY `membershipID` (`membershipID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-
CREATE TABLE IF NOT EXISTS `pbs_bootos` (
`bootosID` int(11) NOT NULL AUTO_INCREMENT,
`groupID` int(11) NOT NULL,
@@ -219,8 +190,6 @@ ALTER TABLE `poolctrl_event`
ADD CONSTRAINT `poolctrl_event_poolidC` FOREIGN KEY (`pbs_poolID`) REFERENCES `pbs_pool` (`poolID`) ON DELETE CASCADE,
ADD CONSTRAINT `poolctrl_event_bootosidC` FOREIGN KEY (`pbs_bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE,
ADD CONSTRAINT `poolctrl_event_membershipidC` FOREIGN KEY (`pbs_membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE CASCADE,
--- ADD CONSTRAINT `poolctrl_event_bootmenuidC` FOREIGN KEY (`pbs_bootmenuID`) REFERENCES `pbs_bootmenu` (`bootmenuID`) ON DELETE CASCADE,
--- ADD CONSTRAINT `poolctrl_event_filteridC` FOREIGN KEY (`pbs_filterID`) REFERENCES `pbs_filter` (`filterID`) ON DELETE CASCADE,
ADD CONSTRAINT `poolctrl_event_categoryC` FOREIGN KEY (`category`) REFERENCES `poolctrl_eventcategory` (`eventcategoryID`) ON DELETE CASCADE,
ADD CONSTRAINT `poolctrl_event_startC` CHECK (start > CURRENT_TIMESTAMP()),
ADD CONSTRAINT `poolctrl_event_endC` CHECK (end > start);
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index 7bfef26..174914b 100644
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -83,20 +83,6 @@ INSERT INTO `pbs_poolentries` (`poolentriesID`, `poolID`, `clientID`) VALUES
(9, 4, 9),
(10, 4, 10);
--- Adding Bootmenus
-INSERT INTO `pbs_bootmenu` (`bootmenuID`, `membershipID`, `groupID`, `title`, `created`,`defaultbootmenu`) VALUES
-(1, NULL, 1, 'Bootmenu 1', '1299694422', '0'),
-(2, NULL, 1, 'Bootmenu 2', '1299694433', '0'),
-(3, NULL, 1, 'Bootmenu 3', '1299694441', '0'),
-(4, NULL, 1, 'Bootmenu 4', '1299694454', '1'),
-(5, NULL, 1, 'Bootmenu 5', '1299694461', '0');
-
--- Adding Filter
-INSERT INTO `pbs_filter` (`filterID`, `membershipID`, `groupID`, `bootmenuID`, `title`, `description`, `created`, `priority`) VALUES
-(1, NULL, 1, 1, 'Filter 1', 'Innerhalb der Uni', '1300022113', 1),
-(2, NULL, 1, 2, 'Filter 2', 'Ausserhalb der Uni', '1302000113', 1),
-(3, NULL, 1, 3, 'Filter 3', 'Montags-Freitag \r\nvon 8 bis 16 Uhr \r\nInnerhalb der Uni', '1302022113', 10);
-
-- Adding eventcategories
INSERT INTO `poolctrl_eventcategory` (`eventcategoryID`, `title`) VALUES
(1, 'Lecture'),