From a888b18a43d27f3ba91f66bddee3f0af90e9bfac Mon Sep 17 00:00:00 2001 From: sebastian wagner Date: Thu, 27 Oct 2011 15:00:49 +0200 Subject: shutdown force fix --- gearman/controllerWorker/ControllerWorker/Shutdown.java | 16 ++++++++-------- 1 file 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: -- cgit v1.2.3-55-g7522