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.java49
1 files changed, 30 insertions, 19 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 1a824db..b7d73bf 100755
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -175,7 +175,7 @@ public class Boot extends Thread {
case A_USER_IS_LOGGED_IN:
ps(client);
-
+
break;
case CHECK_PS_PROGRESS:
@@ -184,13 +184,7 @@ public class Boot extends Thread {
break;
case USERPROCESSES_ARE_RUNNING:
- if (force) {
- logger.info(client.getIp() + " force is enabled");
- // is not working
- client.setState(ClientState.RESTART_CLIENT, gearmanClient);
- } else {
- ls(client);
- }
+ ls(client);
break;
@@ -786,9 +780,18 @@ public class Boot extends Thread {
ClientState.USERPROCESSES_ARE_RUNNING,
gearmanClient);
} else {
- logger.info(client.getIp() + " is working");
- client.setState(ClientState.USER_IS_WORKING,
- gearmanClient);
+ if (force) {
+ logger.info(client.getIp()
+ + " force is enabled");
+ // is not working
+ client.setState(ClientState.RESTART_CLIENT,
+ gearmanClient);
+ } else {
+ logger.info(client.getIp() + " is working");
+ client.setState(
+ ClientState.USER_IS_WORKING,
+ gearmanClient);
+ }
}
client.removeJob(psJob);
} else {
@@ -870,14 +873,22 @@ public class Boot extends Thread {
- scsavTimestamp;
if (beetweenTimestamp < scsavTime) {
- logger
- .info(client.getIp()
- + " screensaver has been running shorter than "
- + scsavTime / (1000 * 60)
- + " minutes, user is working.");
- client.setState(ClientState.USER_IS_WORKING,
- gearmanClient);
- client.removeJob(lsJob);
+ if (force) {
+ logger.info(client.getIp()
+ + " force is enabled");
+ // is not working
+ client.setState(ClientState.RESTART_CLIENT,
+ gearmanClient);
+ } else {
+ logger
+ .info(client.getIp()
+ + " screensaver has been running shorter than "
+ + scsavTime / (1000 * 60)
+ + " minutes, user is working.");
+ client.setState(ClientState.USER_IS_WORKING,
+ gearmanClient);
+ client.removeJob(lsJob);
+ }
} else {
logger
.info(client.getIp()