summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebastian wagner2011-10-27 15:00:49 +0200
committersebastian wagner2011-10-27 15:00:49 +0200
commita888b18a43d27f3ba91f66bddee3f0af90e9bfac (patch)
treee08968d3714e7c8b0507eb7752d02b82bfe6a274
parentboot force fix (diff)
downloadpoolctrl-a888b18a43d27f3ba91f66bddee3f0af90e9bfac.tar.gz
poolctrl-a888b18a43d27f3ba91f66bddee3f0af90e9bfac.tar.xz
poolctrl-a888b18a43d27f3ba91f66bddee3f0af90e9bfac.zip
shutdown force fix
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Shutdown.java16
1 files changed, 8 insertions, 8 deletions
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: