summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebastian wagner2011-10-27 15:00:32 +0200
committersebastian wagner2011-10-27 15:00:32 +0200
commit434564d646f1044f8b715144c0237f1e4d04c7b1 (patch)
tree5305e14260b29c9c7721908b4fe863e78297ab77
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-434564d646f1044f8b715144c0237f1e4d04c7b1.tar.gz
poolctrl-434564d646f1044f8b715144c0237f1e4d04c7b1.tar.xz
poolctrl-434564d646f1044f8b715144c0237f1e4d04c7b1.zip
boot force fix
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index 594f5de..1a824db 100755
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -174,14 +174,8 @@ public class Boot extends Thread {
break;
case A_USER_IS_LOGGED_IN:
- if (force) {
- logger.info(client.getIp() + " force is enabled");
- // is not working
- client.setState(ClientState.RESTART_CLIENT, gearmanClient);
- } else {
- ps(client);
- }
-
+ ps(client);
+
break;
case CHECK_PS_PROGRESS:
@@ -190,7 +184,13 @@ public class Boot extends Thread {
break;
case USERPROCESSES_ARE_RUNNING:
- ls(client);
+ if (force) {
+ logger.info(client.getIp() + " force is enabled");
+ // is not working
+ client.setState(ClientState.RESTART_CLIENT, gearmanClient);
+ } else {
+ ls(client);
+ }
break;