summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-27 16:09:40 +0200
committerBjörn Geiger2011-10-27 16:09:40 +0200
commit3d663101a1ba346c3b86d106980951fa864718ac (patch)
treedd0acf296bb2b3a001e974e007a7f619965ff369
parentEdit weiter korrigiert (diff)
parentshutdown force fix (diff)
downloadpoolctrl-3d663101a1ba346c3b86d106980951fa864718ac.tar.gz
poolctrl-3d663101a1ba346c3b86d106980951fa864718ac.tar.xz
poolctrl-3d663101a1ba346c3b86d106980951fa864718ac.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java18
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Shutdown.java16
2 files changed, 17 insertions, 17 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;
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index 68deb6c..a9da406 100755
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -159,13 +159,7 @@ public class Shutdown extends Thread {
break;
case USER_IS_LOGGED_IN:
- if (force) {
- logger.info(client.getIp() + " force is enabled");
- // is not working
- client.setState(ClientState.SHUTDOWN_CLIENT, gearmanClient);
- } else {
ps(client);
- }
break;
@@ -175,8 +169,14 @@ public class Shutdown extends Thread {
break;
case USERPROCESSES_ARE_RUNNING:
- ls(client);
-
+ if (force) {
+ logger.info(client.getIp() + " force is enabled");
+ // is not working
+ client.setState(ClientState.SHUTDOWN_CLIENT, gearmanClient);
+ } else {
+ ls(client);
+ }
+
break;
case CHECK_LS_PROGRESS: