summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-12 12:56:31 +0200
committerBjörn Geiger2011-09-12 12:56:31 +0200
commit04c58567a5f3fa940a449bfb19053c08fc7dfe01 (patch)
tree491ac211e78dbda7006fd17aacac5ee9880144e4 /gearman
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-04c58567a5f3fa940a449bfb19053c08fc7dfe01.tar.gz
poolctrl-04c58567a5f3fa940a449bfb19053c08fc7dfe01.tar.xz
poolctrl-04c58567a5f3fa940a449bfb19053c08fc7dfe01.zip
minor
Diffstat (limited to 'gearman')
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java4
-rw-r--r--gearman/controllerWorker/ControllerWorker/ControllerWorker.jarbin924682 -> 0 bytes
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java3
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Shutdown.java5
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/SomePingWorker.java2
5 files changed, 6 insertions, 8 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 5c6866a..f5dec4a 100755
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -32,7 +32,7 @@ public class Boot extends Thread {
private String bootOS;
private final int updateRate;
private long waitTime;
- private Vector<String> psWhitelist;
+ //private Vector<String> psWhitelist;
private Vector<String> psBlacklist;
private final GearmanJobServerConnection gearmanConnection;
@@ -61,7 +61,7 @@ public class Boot extends Thread {
this.bootOS = bootOS;
this.waitTime = waitTime * 1000;
this.updateRate = updateRate; // updates per second
- this.psWhitelist = psWhitelist;
+ //this.psWhitelist = psWhitelist;
this.psBlacklist = psBlacklist;
gearmanConnection = new GearmanNIOJobServerConnection(
gearmanServerAddress, gearmanServerPort);
diff --git a/gearman/controllerWorker/ControllerWorker/ControllerWorker.jar b/gearman/controllerWorker/ControllerWorker/ControllerWorker.jar
deleted file mode 100644
index 5a1083f..0000000
--- a/gearman/controllerWorker/ControllerWorker/ControllerWorker.jar
+++ /dev/null
Binary files differ
diff --git a/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java b/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
index d668cd2..09eba5b 100755
--- a/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
+++ b/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
@@ -27,7 +27,8 @@ public class ControllerWorkerMain {
worker.registerFunction(StatusWorker.class);
worker.addServer(connection);
BasicConfigurator.configure();
- iniFile = getIniFile("../../application/configs/application.ini");
+ logger.info(System.getProperty("user.dir"));
+ iniFile = getIniFile("../../+application/configs/application.ini");
String runURL = "http://" + iniFile.getString("poolctrl.host")
+ iniFile.getString("poolctrl.runevent");
String reportURL = "http://" + iniFile.getString("poolctrl.host")
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index 81a47ed..a3e5386 100755
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -2,7 +2,6 @@ package ControllerWorker;
import java.io.IOException;
import java.lang.Thread;
-import java.util.concurrent.ExecutionException;
import java.util.Date;
import java.util.HashMap;
import java.util.StringTokenizer;
@@ -32,7 +31,7 @@ public class Shutdown extends Thread {
private Vector<Client> clients;
private final int updateRate;
private long waitTime;
- private Vector<String> psWhitelist;
+ //private Vector<String> psWhitelist;
private Vector<String> psBlacklist;
private final GearmanJobServerConnection gearmanConnection;
@@ -54,7 +53,7 @@ public class Shutdown extends Thread {
this.clients = clients;
this.updateRate = updateRate; // updates per second
this.waitTime = waitTime * 1000;
- this.psWhitelist = psWhitelist;
+ //this.psWhitelist = psWhitelist;
this.psBlacklist = psBlacklist;
gearmanConnection = new GearmanNIOJobServerConnection(
gearmanServerAddress, gearmanServerPort);
diff --git a/gearman/controllerWorker/ControllerWorker/SomePingWorker.java b/gearman/controllerWorker/ControllerWorker/SomePingWorker.java
index e085b26..cd222df 100755
--- a/gearman/controllerWorker/ControllerWorker/SomePingWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/SomePingWorker.java
@@ -1,10 +1,8 @@
package ControllerWorker;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
-import java.util.concurrent.ExecutionException;
import org.gearman.client.GearmanClient;
import org.gearman.client.GearmanClientImpl;