summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-13 15:56:42 +0200
committerBjörn Geiger2011-09-13 15:56:42 +0200
commit51946283ca2eec59527f22af989e53374a7eb598 (patch)
tree5ba685c58be2972c0e91d3d2f84c4185c23455b3
parentPfad der Application.ini wird dem Java nun per Kommandozeile übergeben (diff)
downloadpoolctrl-51946283ca2eec59527f22af989e53374a7eb598.tar.gz
poolctrl-51946283ca2eec59527f22af989e53374a7eb598.tar.xz
poolctrl-51946283ca2eec59527f22af989e53374a7eb598.zip
Logging nun auch in File möglich, 2. Parameter
-rwxr-xr-xgearman/controllerWorker.jarbin926955 -> 927091 bytes
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java2
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/BootWorker.java2
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java61
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/PoolctrlRequest.java4
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Shutdown.java2
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ShutdownWorker.java2
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/SomePingWorker.java2
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/StatusWorker.java4
-rwxr-xr-xgearman/worker.sh2
10 files changed, 54 insertions, 27 deletions
diff --git a/gearman/controllerWorker.jar b/gearman/controllerWorker.jar
index b82a5d0..3e6cff4 100755
--- a/gearman/controllerWorker.jar
+++ b/gearman/controllerWorker.jar
Binary files differ
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 6bc5c74..6a71890 100755
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -23,7 +23,7 @@ import org.json.simple.JSONValue;
import org.apache.log4j.Logger;
public class Boot extends Thread {
- static final Logger logger = Logger.getLogger(Boot.class);
+ private static final Logger logger = ControllerWorkerMain.getLogger();
private String eventName;
private Vector<Client> clients;
diff --git a/gearman/controllerWorker/ControllerWorker/BootWorker.java b/gearman/controllerWorker/ControllerWorker/BootWorker.java
index f26bf12..f124350 100755
--- a/gearman/controllerWorker/ControllerWorker/BootWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/BootWorker.java
@@ -15,7 +15,7 @@ import org.json.simple.JSONValue;
import org.apache.log4j.Logger;
public class BootWorker extends AbstractGearmanFunction {
- static final Logger logger = Logger.getLogger(BootWorker.class);
+ private static final Logger logger = ControllerWorkerMain.getLogger();
@Override
public String getName() {
diff --git a/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java b/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
index d0c821a..bd29ad0 100755
--- a/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
+++ b/gearman/controllerWorker/ControllerWorker/ControllerWorkerMain.java
@@ -9,35 +9,58 @@ import org.gearman.common.GearmanNIOJobServerConnection;
import org.gearman.worker.GearmanWorker;
import org.gearman.worker.GearmanWorkerImpl;
-import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.FileAppender;
import org.apache.log4j.Logger;
+import org.apache.log4j.SimpleLayout;
public class ControllerWorkerMain {
- static final Logger logger = Logger.getLogger(BootWorker.class);
-
+ private static final Logger logger = Logger
+ .getLogger(ControllerWorkerMain.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());
+ if (args.length <= 1) {
+ ConsoleAppender consoleAppender = new ConsoleAppender(
+ new SimpleLayout());
+ logger.addAppender(consoleAppender);
+ } else {
+ try {
+ FileAppender fileAppender = new FileAppender(
+ new SimpleLayout(), args[1], true);
+ logger.addAppender(fileAppender);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if (args.length >= 1) {
+ 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();
+ worker.registerFunction(SomePingWorker.class);
+ worker.registerFunction(BootWorker.class);
+ worker.registerFunction(ShutdownWorker.class);
+ worker.registerFunction(StatusWorker.class);
+ worker.addServer(connection);
+ PoolctrlRequest poolctrlRequest = new PoolctrlRequest();
+ poolctrlRequest.start();
+ worker.work();
+ } else {
+ logger.error("No parameters given!");
}
- final GearmanJobServerConnection connection = new GearmanNIOJobServerConnection(
- "127.0.0.1", 4730);
- GearmanWorker worker = new GearmanWorkerImpl();
- worker.registerFunction(SomePingWorker.class);
- worker.registerFunction(BootWorker.class);
- worker.registerFunction(ShutdownWorker.class);
- worker.registerFunction(StatusWorker.class);
- worker.addServer(connection);
- PoolctrlRequest poolctrlRequest = new PoolctrlRequest();
- poolctrlRequest.start();
- worker.work();
}
public static ResourceBundle getIniFile() {
return iniFile;
}
+
+ public static Logger getLogger() {
+ return logger;
+ }
} \ No newline at end of file
diff --git a/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java b/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
index 4d877c5..f35d10c 100755
--- a/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
+++ b/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
@@ -8,13 +8,13 @@ import java.net.URL;
import org.apache.log4j.Logger;
public class PoolctrlRequest extends Thread {
- static final Logger logger = Logger.getLogger(PoolctrlRequest.class);
-
+ private Logger logger;
private URL runURL;
private URL reportURL;
private final long updatePeriod;
public PoolctrlRequest() {
+ logger = ControllerWorkerMain.getLogger();
updatePeriod = Long.parseLong(ControllerWorkerMain.getIniFile()
.getString("event.updatePeriod")) * 60L * 1000000000L; // nanoseconds
try {
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index 0395cfb..b0c869e 100755
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -23,7 +23,7 @@ import org.json.simple.JSONValue;
import org.apache.log4j.Logger;
public class Shutdown extends Thread {
- static final Logger logger = Logger.getLogger(Shutdown.class);
+ private static final Logger logger = ControllerWorkerMain.getLogger();
private String eventName;
private Vector<Client> clients;
diff --git a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
index 46520c5..54cca5f 100755
--- a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
@@ -15,7 +15,7 @@ import org.json.simple.JSONValue;
import org.apache.log4j.Logger;
public class ShutdownWorker extends AbstractGearmanFunction {
- static final Logger logger = Logger.getLogger(ShutdownWorker.class);
+ private static final Logger logger = ControllerWorkerMain.getLogger();;
@Override
public String getName() {
diff --git a/gearman/controllerWorker/ControllerWorker/SomePingWorker.java b/gearman/controllerWorker/ControllerWorker/SomePingWorker.java
index cd222df..1260dca 100755
--- a/gearman/controllerWorker/ControllerWorker/SomePingWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/SomePingWorker.java
@@ -22,7 +22,7 @@ import org.json.simple.JSONValue;
import org.apache.log4j.Logger;
public class SomePingWorker extends AbstractGearmanFunction {
- static final Logger logger = Logger.getLogger(SomePingWorker.class);
+ private static final Logger logger = ControllerWorkerMain.getLogger();
@Override
public String getName() {
diff --git a/gearman/controllerWorker/ControllerWorker/StatusWorker.java b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
index 1698129..a619481 100755
--- a/gearman/controllerWorker/ControllerWorker/StatusWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
@@ -12,7 +12,11 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
+//import org.apache.log4j.Logger;
+
public class StatusWorker extends AbstractGearmanFunction {
+ //private static final Logger logger = ControllerWorkerMain.getLogger();
+
static HashMap<String, Boot> BOOTTHREADS = new HashMap<String, Boot>();
static HashMap<String, Shutdown> SHUTDOWNTHREADS = new HashMap<String, Shutdown>();
diff --git a/gearman/worker.sh b/gearman/worker.sh
index 1282da9..94271ed 100755
--- a/gearman/worker.sh
+++ b/gearman/worker.sh
@@ -34,4 +34,4 @@
./shutdownWorker.py >> shutdownWorker.log 2>&1 &
./shutdownWorker.py >> shutdownWorker.log 2>&1 &
./shutdownWorker.py >> shutdownWorker.log 2>&1 &
-
+#./controllerWorker.jar ../application/configs/application.ini controllerWorker.log &