summaryrefslogtreecommitdiffstats
path: root/gearman/controllerWorker/ControllerWorker/Boot.java
diff options
context:
space:
mode:
Diffstat (limited to 'gearman/controllerWorker/ControllerWorker/Boot.java')
-rw-r--r--gearman/controllerWorker/ControllerWorker/Boot.java18
1 files changed, 12 insertions, 6 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 3e76d93..a32c4aa 100644
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -29,6 +29,7 @@ public class Boot extends Thread {
private Boolean error;
private final int updateRate;
private final long updatePeriod;
+ private long waitTime;
private String bootOS;
private String[] statusText;
@@ -52,7 +53,7 @@ public class Boot extends Thread {
public Boot(String serverAddress, int port,
Vector<HashMap<String, String>> clients, int updateRate,
- String bootOS) {
+ long waitTime, String bootOS) {
this.pingJobs = new HashMap<Integer, GearmanJob>();
this.pingWoLJobs = new HashMap<Integer, GearmanJob>();
this.wolJobs = new HashMap<Integer, GearmanJob>();
@@ -72,6 +73,7 @@ public class Boot extends Thread {
this.gearmanClient = new GearmanClientImpl();
gearmanClient.addJobServer(this.gearmanConnection);
this.clients = clients;
+ this.waitTime = waitTime;
for (HashMap<String, String> client : clients) {
int clientID = Integer.parseInt(client.get("id"));
status.put(clientID, 0); // no work
@@ -235,7 +237,8 @@ public class Boot extends Thread {
Date currentDate = new Date();
Long currentTimestamp = currentDate.getTime();
// wait 2 min until WoL - Failed
- Long expectedTimestamp = this.pingWolTime.get(clientID) + 120000L;
+ Long expectedTimestamp = this.pingWolTime.get(clientID)
+ + waitTime;
if (expectedTimestamp >= currentTimestamp) {
GearmanJobStatus jobStatus = gearmanClient
.getJobStatus(pingJobWoL);
@@ -486,14 +489,17 @@ public class Boot extends Thread {
Date currentDate = new Date();
Long currentTimestamp = currentDate.getTime();
// wait 2 min until Restart - Failed
- Long expectedTimestamp = this.pingRestartTime.get(clientID) + 120000L;
+ Long expectedTimestamp = this.pingRestartTime.get(clientID)
+ + waitTime;
if (expectedTimestamp >= currentTimestamp) {
GearmanJobStatus jobStatus = gearmanClient
.getJobStatus(pingJobRestart);
if (!jobStatus.isKnown() && pingJobRestart.isDone()) {
- GearmanJobResult pingJobRes = pingJobRestart.get();
- String result = ByteUtils.fromUTF8Bytes(pingJobRes
- .getResults());
+ GearmanJobResult pingJobRestartRes = pingJobRestart
+ .get();
+ String result = ByteUtils
+ .fromUTF8Bytes(pingJobRestartRes
+ .getResults());
if (result != "") {
JSONObject resultObj = (JSONObject) JSONValue
.parse(result);