summaryrefslogtreecommitdiffstats
path: root/gearman/controllerWorker/ControllerWorker/Boot.java
diff options
context:
space:
mode:
Diffstat (limited to 'gearman/controllerWorker/ControllerWorker/Boot.java')
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 77b31a6..d960098 100755
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -31,6 +31,7 @@ public class Boot extends Thread {
private String bootOS;
private final int updateRate;
private long waitTime;
+ private long scsavTime;
// private Vector<String> psWhitelist;
private Vector<String> psBlacklist;
private String scsavPID;
@@ -48,6 +49,7 @@ public class Boot extends Thread {
this.clients = clients;
this.bootOS = bootOS;
this.waitTime = waitTime * 1000;
+ this.scsavTime = scsavTime * 1000;
this.updateRate = updateRate; // updates per second
// this.psWhitelist = psWhitelist;
this.psBlacklist = psBlacklist;
@@ -725,7 +727,7 @@ public class Boot extends Thread {
JSONObject resultObj = (JSONObject) JSONValue.parse(result);
if (!resultObj.containsKey("err")) {
JSONArray ps = (JSONArray) resultObj.get("ps");
- scsavPID = resultObj.get("pid").toString();
+ //scsavPID = resultObj.get("pid").toString();
// boolean whitelistFound = false;
boolean blacklistFound = false;
@@ -800,19 +802,20 @@ public class Boot extends Thread {
if (!result.isEmpty()) {
JSONObject resultObj = (JSONObject) JSONValue.parse(result);
if (!resultObj.containsKey("err")) {
- /*
+
String clientScreenSaver = resultObj.get(scsavPID)
.toString()
+ " " + resultObj.get("date").toString();
-
+ /*
//check screensaver has been running longer than 30min/1h
if(clientScreenSaver < 30) {
+ logger.info(client.getIp() + " screensaver has been running shorter than " + scsavTime/(1000*60) + " minutes.");
client.setState(ClientState.USER_IS_WORKING, gearmanClient);
client.removeJob(lsJob);
} else {
+ logger.info(client.getIp() + " screensaver has been running longer than " + scsavTime/(1000*60) + " minutes.");
client.setState(ClientState.RESTART_CLIENT, gearmanClient);
client.removeJob(lsJob);
-
}*/
}
} else {