From f71851601225c78175c752fcfe97ce9aca87e272 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 17 Oct 2011 15:17:22 +0200 Subject: ls progress update --- gearman/controllerWorker/ControllerWorker/Boot.java | 11 +++++++---- gearman/controllerWorker/ControllerWorker/ClientState.java | 2 ++ gearman/controllerWorker/ControllerWorker/Shutdown.java | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'gearman') 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 psWhitelist; private Vector 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 { diff --git a/gearman/controllerWorker/ControllerWorker/ClientState.java b/gearman/controllerWorker/ControllerWorker/ClientState.java index 37aebca..8b08922 100755 --- a/gearman/controllerWorker/ControllerWorker/ClientState.java +++ b/gearman/controllerWorker/ControllerWorker/ClientState.java @@ -76,6 +76,8 @@ public enum ClientState { return "[" + this.state + "] A user is logged in."; case CHECK_PS_PROGRESS: return "[" + this.state + "] The check if the user is working has been intialized."; + case CHECK_LS_PROGRESS: + return "[" + this.state + "] The check if the screensaver has been running longer than 60min has been intialized."; case USER_IS_WORKING: return "[" + this.state + "] The user is working."; case CLIENT_NOT_ALIVE: diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java index fda54e0..8c90d7f 100755 --- a/gearman/controllerWorker/ControllerWorker/Shutdown.java +++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java @@ -30,6 +30,7 @@ public class Shutdown extends Thread { private Vector clients; private final int updateRate; private long waitTime; + private long scsavTime; // private Vector psWhitelist; private Vector psBlacklist; private String scsavPID; @@ -47,6 +48,7 @@ public class Shutdown extends Thread { this.clients = clients; this.updateRate = updateRate; // updates per second this.waitTime = waitTime * 1000; + this.scsavTime = scsavTime * 1000; // this.psWhitelist = psWhitelist; this.psBlacklist = psBlacklist; gearmanConnection = new GearmanNIOJobServerConnection( @@ -481,6 +483,7 @@ public class Shutdown extends Thread { JSONObject resultObj = (JSONObject) JSONValue.parse(result); if (!resultObj.containsKey("err")) { JSONArray ps = (JSONArray) resultObj.get("ps"); + //scsavPID = resultObj.get("pid").toString(); // boolean whitelistFound = false; boolean blacklistFound = false; @@ -565,12 +568,13 @@ public class Shutdown extends Thread { //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 { -- cgit v1.2.3-55-g7522