summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-13 16:09:52 +0200
committerBjörn Geiger2011-09-13 16:09:52 +0200
commitc8cbed7625ec04bdd0e07dfdba9dfa366dd35213 (patch)
treedf38e16e87acd37dc06d87917171410f7b14afb2 /gearman
parentminor (diff)
downloadpoolctrl-c8cbed7625ec04bdd0e07dfdba9dfa366dd35213.tar.gz
poolctrl-c8cbed7625ec04bdd0e07dfdba9dfa366dd35213.tar.xz
poolctrl-c8cbed7625ec04bdd0e07dfdba9dfa366dd35213.zip
verschiedenes
Diffstat (limited to 'gearman')
-rwxr-xr-xgearman/controllerWorker.jarbin927225 -> 927820 bytes
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/BootWorker.java12
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Client.java7
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ClientJob.java6
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ClientPingTime.java5
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java22
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/PoolctrlRequest.java10
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ShutdownWorker.java12
8 files changed, 52 insertions, 22 deletions
diff --git a/gearman/controllerWorker.jar b/gearman/controllerWorker.jar
index f438976..60a2add 100755
--- a/gearman/controllerWorker.jar
+++ b/gearman/controllerWorker.jar
Binary files differ
diff --git a/gearman/controllerWorker/ControllerWorker/BootWorker.java b/gearman/controllerWorker/ControllerWorker/BootWorker.java
index f124350..0963aef 100755
--- a/gearman/controllerWorker/ControllerWorker/BootWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/BootWorker.java
@@ -38,18 +38,18 @@ public class BootWorker extends AbstractGearmanFunction {
clients.add(client);
}
- String gearmanServerHost = ControllerWorkerMain.getIniFile().getString(
+ String gearmanServerHost = ControllerWorkerMain.getApplication_ini().getString(
"gearman.server.host");
int gearmanServerPort = Integer.parseInt(ControllerWorkerMain
- .getIniFile().getString("gearman.server.port"));
- long waitTime = Long.parseLong(ControllerWorkerMain.getIniFile()
+ .getApplication_ini().getString("gearman.server.port"));
+ long waitTime = Long.parseLong(ControllerWorkerMain.getApplication_ini()
.getString("gearman.worker.waitTime"));
- int updateRate = Integer.parseInt(ControllerWorkerMain.getIniFile()
+ int updateRate = Integer.parseInt(ControllerWorkerMain.getApplication_ini()
.getString("gearman.worker.updateRate"));
- String blacklist = ControllerWorkerMain.getIniFile().getString(
+ String blacklist = ControllerWorkerMain.getApplication_ini().getString(
"gearman.worker.ps.blacklist");
StringTokenizer blacklistTokenizer = new StringTokenizer(blacklist, ",");
- String whitelist = ControllerWorkerMain.getIniFile().getString(
+ String whitelist = ControllerWorkerMain.getApplication_ini().getString(
"gearman.worker.ps.whitelist");
StringTokenizer whitelistTokenizer = new StringTokenizer(whitelist, ",");
Vector<String> psWhitelist = new Vector<String>();
diff --git a/gearman/controllerWorker/ControllerWorker/Client.java b/gearman/controllerWorker/ControllerWorker/Client.java
index dd18643..86d21b5 100755
--- a/gearman/controllerWorker/ControllerWorker/Client.java
+++ b/gearman/controllerWorker/ControllerWorker/Client.java
@@ -100,4 +100,11 @@ public class Client {
public void finish() {
this.finished = true;
}
+
+ @Override
+ public String toString() {
+ return "Client [error=" + error + ", finished=" + finished + ", id="
+ + id + ", ip=" + ip + ", jobs=" + jobs + ", mac=" + mac
+ + ", state=" + state + ", times=" + times + "]";
+ }
} \ No newline at end of file
diff --git a/gearman/controllerWorker/ControllerWorker/ClientJob.java b/gearman/controllerWorker/ControllerWorker/ClientJob.java
index 5492208..c4aa1e8 100755
--- a/gearman/controllerWorker/ControllerWorker/ClientJob.java
+++ b/gearman/controllerWorker/ControllerWorker/ClientJob.java
@@ -26,4 +26,10 @@ public class ClientJob {
public GearmanJob getGearmanJob() {
return gearmanJob;
}
+
+ @Override
+ public String toString() {
+ return "ClientJob [JobType=" + JobType + ", gearmanJob=" + gearmanJob
+ + "]";
+ }
} \ No newline at end of file
diff --git a/gearman/controllerWorker/ControllerWorker/ClientPingTime.java b/gearman/controllerWorker/ControllerWorker/ClientPingTime.java
index dadb399..7192fa6 100755
--- a/gearman/controllerWorker/ControllerWorker/ClientPingTime.java
+++ b/gearman/controllerWorker/ControllerWorker/ClientPingTime.java
@@ -22,4 +22,9 @@ public class ClientPingTime {
public long getTime() {
return time;
}
+
+ @Override
+ public String toString() {
+ return "ClientPingTime [time=" + time + ", type=" + type + "]";
+ }
}
diff --git a/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java b/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
index bd29ad0..83a4068 100755
--- a/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
+++ b/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
@@ -17,15 +17,21 @@ import org.apache.log4j.SimpleLayout;
public class ControllerWorkerMain {
private static final Logger logger = Logger
.getLogger(ControllerWorkerMain.class);
- private static ResourceBundle iniFile;
+ private static ResourceBundle application_ini;
public static void main(String[] args) {
if (args.length <= 1) {
+ /**
+ * logger schreibt auf Konsole
+ */
ConsoleAppender consoleAppender = new ConsoleAppender(
new SimpleLayout());
logger.addAppender(consoleAppender);
} else {
try {
+ /**
+ * schreiben eines Log Files, 2. Übergabeparameter
+ */
FileAppender fileAppender = new FileAppender(
new SimpleLayout(), args[1], true);
logger.addAppender(fileAppender);
@@ -35,8 +41,11 @@ public class ControllerWorkerMain {
}
if (args.length >= 1) {
try {
- iniFile = new PropertyResourceBundle(new FileInputStream(
- args[0]));
+ /**
+ * application.ini laden, 1. Übergabeparameter
+ */
+ application_ini = new PropertyResourceBundle(
+ new FileInputStream(args[0]));
} catch (Exception e) {
logger.error(e.toString());
}
@@ -52,12 +61,15 @@ public class ControllerWorkerMain {
poolctrlRequest.start();
worker.work();
} else {
+ /**
+ * keine Übergabeparameter vorhanden
+ */
logger.error("No parameters given!");
}
}
- public static ResourceBundle getIniFile() {
- return iniFile;
+ public static ResourceBundle getApplication_ini() {
+ return application_ini;
}
public static Logger getLogger() {
diff --git a/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java b/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
index f35d10c..322cb3d 100755
--- a/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
+++ b/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
@@ -15,18 +15,18 @@ public class PoolctrlRequest extends Thread {
public PoolctrlRequest() {
logger = ControllerWorkerMain.getLogger();
- updatePeriod = Long.parseLong(ControllerWorkerMain.getIniFile()
+ updatePeriod = Long.parseLong(ControllerWorkerMain.getApplication_ini()
.getString("event.updatePeriod")) * 60L * 1000000000L; // nanoseconds
try {
this.runURL = new URL("http://"
- + ControllerWorkerMain.getIniFile().getString(
+ + ControllerWorkerMain.getApplication_ini().getString(
"poolctrl.host")
- + ControllerWorkerMain.getIniFile().getString(
+ + ControllerWorkerMain.getApplication_ini().getString(
"poolctrl.runevent"));
this.reportURL = new URL("http://"
- + ControllerWorkerMain.getIniFile().getString(
+ + ControllerWorkerMain.getApplication_ini().getString(
"poolctrl.host")
- + ControllerWorkerMain.getIniFile().getString(
+ + ControllerWorkerMain.getApplication_ini().getString(
"poolctrl.reportevent"));
} catch (Exception e) {
logger.error(e.toString());
diff --git a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
index 54cca5f..4057d9f 100755
--- a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
@@ -37,18 +37,18 @@ public class ShutdownWorker extends AbstractGearmanFunction {
clients.add(client);
}
- String gearmanServerHost = ControllerWorkerMain.getIniFile().getString(
+ String gearmanServerHost = ControllerWorkerMain.getApplication_ini().getString(
"gearman.server.host");
int gearmanServerPort = Integer.parseInt(ControllerWorkerMain
- .getIniFile().getString("gearman.server.port"));
- long waitTime = Long.parseLong(ControllerWorkerMain.getIniFile()
+ .getApplication_ini().getString("gearman.server.port"));
+ long waitTime = Long.parseLong(ControllerWorkerMain.getApplication_ini()
.getString("gearman.worker.waitTime"));
- int updateRate = Integer.parseInt(ControllerWorkerMain.getIniFile()
+ int updateRate = Integer.parseInt(ControllerWorkerMain.getApplication_ini()
.getString("gearman.worker.updateRate"));
- String blacklist = ControllerWorkerMain.getIniFile().getString(
+ String blacklist = ControllerWorkerMain.getApplication_ini().getString(
"gearman.worker.ps.blacklist");
StringTokenizer blacklistTokenizer = new StringTokenizer(blacklist, ",");
- String whitelist = ControllerWorkerMain.getIniFile().getString(
+ String whitelist = ControllerWorkerMain.getApplication_ini().getString(
"gearman.worker.ps.whitelist");
StringTokenizer whitelistTokenizer = new StringTokenizer(whitelist, ",");
Vector<String> psWhitelist = new Vector<String>();