summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-28 13:26:18 +0200
committerBjörn Geiger2011-10-28 13:26:18 +0200
commita5c250f310d405cc31bb872808c9b28b659037f7 (patch)
tree4d3725c6d2e6efbf11e5fef7bac5d57ac8d77707
parentcontrollerWorker.jar update (diff)
downloadpoolctrl-a5c250f310d405cc31bb872808c9b28b659037f7.tar.gz
poolctrl-a5c250f310d405cc31bb872808c9b28b659037f7.tar.xz
poolctrl-a5c250f310d405cc31bb872808c9b28b659037f7.zip
controllerWorker force korrigiert
-rwxr-xr-xgearman/controllerWorker.jarbin939818 -> 939892 bytes
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java49
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Shutdown.java56
3 files changed, 64 insertions, 41 deletions
diff --git a/gearman/controllerWorker.jar b/gearman/controllerWorker.jar
index d9d558a..99c9a20 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 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()
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index a9da406..3edf61e 100755
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -159,7 +159,7 @@ public class Shutdown extends Thread {
break;
case USER_IS_LOGGED_IN:
- ps(client);
+ ps(client);
break;
@@ -169,14 +169,8 @@ public class Shutdown extends Thread {
break;
case USERPROCESSES_ARE_RUNNING:
- if (force) {
- logger.info(client.getIp() + " force is enabled");
- // is not working
- client.setState(ClientState.SHUTDOWN_CLIENT, gearmanClient);
- } else {
- ls(client);
- }
-
+ ls(client);
+
break;
case CHECK_LS_PROGRESS:
@@ -543,10 +537,20 @@ public class Shutdown extends Thread {
ClientState.USERPROCESSES_ARE_RUNNING,
gearmanClient);
} else {
- logger.info(client.getIp() + " is working");
- // client.setState(ClientState.USERPROCESSES_ARE_RUNNING,
- client.setState(ClientState.USER_IS_WORKING,
- gearmanClient);
+ if (force) {
+ logger.info(client.getIp()
+ + " force is enabled");
+ // is not working
+ client.setState(
+ ClientState.SHUTDOWN_CLIENT,
+ gearmanClient);
+ } else {
+ logger.info(client.getIp() + " is working");
+ // client.setState(ClientState.USERPROCESSES_ARE_RUNNING,
+ client.setState(
+ ClientState.USER_IS_WORKING,
+ gearmanClient);
+ }
}
client.removeJob(psJob);
} else {
@@ -629,21 +633,29 @@ public class Shutdown 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.SHUTDOWN_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()
+ " screensaver has been running longer than "
+ scsavTime / (1000 * 60)
+ " minutes, user is not working.");
- client.setState(ClientState.RESTART_CLIENT,
+ client.setState(ClientState.SHUTDOWN_CLIENT,
gearmanClient);
client.removeJob(lsJob);
}