summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-13 14:57:34 +0200
committerBjörn Geiger2011-09-13 14:57:34 +0200
commite0897d42e6a1130dabe33b4a9ffa7eae6c5fc363 (patch)
treed4b6dcfea3c628d2d7804c9d286a381509ed81d9 /gearman
parentminor (diff)
downloadpoolctrl-e0897d42e6a1130dabe33b4a9ffa7eae6c5fc363.tar.gz
poolctrl-e0897d42e6a1130dabe33b4a9ffa7eae6c5fc363.tar.xz
poolctrl-e0897d42e6a1130dabe33b4a9ffa7eae6c5fc363.zip
Pfad der Application.ini wird dem Java nun per Kommandozeile übergeben
Diffstat (limited to 'gearman')
-rwxr-xr-xgearman/controllerWorker.jarbin927145 -> 926955 bytes
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/BootWorker.java32
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java18
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/PoolctrlRequest.java28
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ShutdownWorker.java32
5 files changed, 48 insertions, 62 deletions
diff --git a/gearman/controllerWorker.jar b/gearman/controllerWorker.jar
index a0385a6..b82a5d0 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 e4b720c..f26bf12 100755
--- a/gearman/controllerWorker/ControllerWorker/BootWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/BootWorker.java
@@ -1,8 +1,5 @@
package ControllerWorker;
-import java.io.FileInputStream;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -20,8 +17,6 @@ import org.apache.log4j.Logger;
public class BootWorker extends AbstractGearmanFunction {
static final Logger logger = Logger.getLogger(BootWorker.class);
- private ResourceBundle iniFile;
-
@Override
public String getName() {
return "boot";
@@ -29,7 +24,6 @@ public class BootWorker extends AbstractGearmanFunction {
@Override
public GearmanJobResult executeFunction() {
- iniFile = getIniFile("../../application/configs/application.ini");
String data = ByteUtils.fromUTF8Bytes((byte[]) this.data);
Vector<Client> clients = new Vector<Client>();
JSONObject jsonObject = (JSONObject) JSONValue.parse(data);
@@ -44,16 +38,19 @@ public class BootWorker extends AbstractGearmanFunction {
clients.add(client);
}
- String gearmanServerHost = iniFile.getString("gearman.server.host");
- int gearmanServerPort = Integer.parseInt(iniFile
- .getString("gearman.server.port"));
- long waitTime = Long.parseLong(iniFile
+ String gearmanServerHost = ControllerWorkerMain.getIniFile().getString(
+ "gearman.server.host");
+ int gearmanServerPort = Integer.parseInt(ControllerWorkerMain
+ .getIniFile().getString("gearman.server.port"));
+ long waitTime = Long.parseLong(ControllerWorkerMain.getIniFile()
.getString("gearman.worker.waitTime"));
- int updateRate = Integer.parseInt(iniFile
+ int updateRate = Integer.parseInt(ControllerWorkerMain.getIniFile()
.getString("gearman.worker.updateRate"));
- String blacklist = iniFile.getString("gearman.worker.ps.blacklist");
+ String blacklist = ControllerWorkerMain.getIniFile().getString(
+ "gearman.worker.ps.blacklist");
StringTokenizer blacklistTokenizer = new StringTokenizer(blacklist, ",");
- String whitelist = iniFile.getString("gearman.worker.ps.whitelist");
+ String whitelist = ControllerWorkerMain.getIniFile().getString(
+ "gearman.worker.ps.whitelist");
StringTokenizer whitelistTokenizer = new StringTokenizer(whitelist, ",");
Vector<String> psWhitelist = new Vector<String>();
Vector<String> psBlacklist = new Vector<String>();
@@ -81,13 +78,4 @@ public class BootWorker extends AbstractGearmanFunction {
res.getBytes(), warnings, exceptions, numerator, denominator);
return gjr;
}
-
- private static PropertyResourceBundle getIniFile(String file) {
- try {
- return new PropertyResourceBundle(new FileInputStream(file));
- } catch (Exception e) {
- logger.error(e.toString());
- return null;
- }
- }
} \ No newline at end of file
diff --git a/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java b/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
index 88db8e7..d0c821a 100755
--- a/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
+++ b/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
@@ -1,15 +1,29 @@
package ControllerWorker;
+import java.io.FileInputStream;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+
import org.gearman.common.GearmanJobServerConnection;
import org.gearman.common.GearmanNIOJobServerConnection;
import org.gearman.worker.GearmanWorker;
import org.gearman.worker.GearmanWorkerImpl;
import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Logger;
public class ControllerWorkerMain {
+ static final Logger logger = Logger.getLogger(BootWorker.class);
+
+ private static ResourceBundle iniFile;
+
public static void main(String[] args) {
BasicConfigurator.configure();
+ try {
+ iniFile = new PropertyResourceBundle(new FileInputStream(args[0]));
+ } catch (Exception e) {
+ logger.error(e.toString());
+ }
final GearmanJobServerConnection connection = new GearmanNIOJobServerConnection(
"127.0.0.1", 4730);
GearmanWorker worker = new GearmanWorkerImpl();
@@ -22,4 +36,8 @@ public class ControllerWorkerMain {
poolctrlRequest.start();
worker.work();
}
+
+ public static ResourceBundle getIniFile() {
+ return iniFile;
+ }
} \ No newline at end of file
diff --git a/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java b/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
index 102c762..4d877c5 100755
--- a/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
+++ b/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
@@ -1,11 +1,9 @@
package ControllerWorker;
import java.io.BufferedReader;
-import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.util.PropertyResourceBundle;
import org.apache.log4j.Logger;
@@ -15,18 +13,21 @@ public class PoolctrlRequest extends Thread {
private URL runURL;
private URL reportURL;
private final long updatePeriod;
- private PropertyResourceBundle iniFile;
public PoolctrlRequest() {
- iniFile = getIniFile("../../application/configs/application.ini");
- updatePeriod = Long.parseLong(iniFile.getString("event.updatePeriod")) * 60L * 1000000000L; // nanoseconds
+ updatePeriod = Long.parseLong(ControllerWorkerMain.getIniFile()
+ .getString("event.updatePeriod")) * 60L * 1000000000L; // nanoseconds
try {
this.runURL = new URL("http://"
- + iniFile.getString("poolctrl.host")
- + iniFile.getString("poolctrl.runevent"));
+ + ControllerWorkerMain.getIniFile().getString(
+ "poolctrl.host")
+ + ControllerWorkerMain.getIniFile().getString(
+ "poolctrl.runevent"));
this.reportURL = new URL("http://"
- + iniFile.getString("poolctrl.host")
- + iniFile.getString("poolctrl.reportevent"));
+ + ControllerWorkerMain.getIniFile().getString(
+ "poolctrl.host")
+ + ControllerWorkerMain.getIniFile().getString(
+ "poolctrl.reportevent"));
} catch (Exception e) {
logger.error(e.toString());
}
@@ -89,13 +90,4 @@ public class PoolctrlRequest extends Thread {
logger.error(e.toString());
}
}
-
- private static PropertyResourceBundle getIniFile(String file) {
- try {
- return new PropertyResourceBundle(new FileInputStream(file));
- } catch (Exception e) {
- logger.error(e.toString());
- return null;
- }
- }
} \ No newline at end of file
diff --git a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
index c6f63b9..46520c5 100755
--- a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
@@ -1,8 +1,5 @@
package ControllerWorker;
-import java.io.FileInputStream;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -20,8 +17,6 @@ import org.apache.log4j.Logger;
public class ShutdownWorker extends AbstractGearmanFunction {
static final Logger logger = Logger.getLogger(ShutdownWorker.class);
- private ResourceBundle iniFile;
-
@Override
public String getName() {
return "shutdown";
@@ -29,7 +24,6 @@ public class ShutdownWorker extends AbstractGearmanFunction {
@Override
public GearmanJobResult executeFunction() {
- iniFile = getIniFile("../../application/configs/application.ini");
String data = ByteUtils.fromUTF8Bytes((byte[]) this.data);
Vector<Client> clients = new Vector<Client>();
JSONObject jsonObject = (JSONObject) JSONValue.parse(data);
@@ -43,16 +37,19 @@ public class ShutdownWorker extends AbstractGearmanFunction {
clients.add(client);
}
- String gearmanServerHost = iniFile.getString("gearman.server.host");
- int gearmanServerPort = Integer.parseInt(iniFile
- .getString("gearman.server.port"));
- long waitTime = Long.parseLong(iniFile
+ String gearmanServerHost = ControllerWorkerMain.getIniFile().getString(
+ "gearman.server.host");
+ int gearmanServerPort = Integer.parseInt(ControllerWorkerMain
+ .getIniFile().getString("gearman.server.port"));
+ long waitTime = Long.parseLong(ControllerWorkerMain.getIniFile()
.getString("gearman.worker.waitTime"));
- int updateRate = Integer.parseInt(iniFile
+ int updateRate = Integer.parseInt(ControllerWorkerMain.getIniFile()
.getString("gearman.worker.updateRate"));
- String blacklist = iniFile.getString("gearman.worker.ps.blacklist");
+ String blacklist = ControllerWorkerMain.getIniFile().getString(
+ "gearman.worker.ps.blacklist");
StringTokenizer blacklistTokenizer = new StringTokenizer(blacklist, ",");
- String whitelist = iniFile.getString("gearman.worker.ps.whitelist");
+ String whitelist = ControllerWorkerMain.getIniFile().getString(
+ "gearman.worker.ps.whitelist");
StringTokenizer whitelistTokenizer = new StringTokenizer(whitelist, ",");
Vector<String> psWhitelist = new Vector<String>();
Vector<String> psBlacklist = new Vector<String>();
@@ -80,13 +77,4 @@ public class ShutdownWorker extends AbstractGearmanFunction {
res.getBytes(), warnings, exceptions, numerator, denominator);
return gjr;
}
-
- private static PropertyResourceBundle getIniFile(String file) {
- try {
- return new PropertyResourceBundle(new FileInputStream(file));
- } catch (Exception e) {
- logger.error(e.toString());
- return null;
- }
- }
} \ No newline at end of file