From 7ba1f68a9cc63e0744b63bfdaa98bcd0152e3689 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 5 Sep 2011 13:04:54 +0200 Subject: some clean up --- .../controllerWorker/ControllerWorker/Boot.java | 6 ++- .../ControllerWorker/ClientState.java | 53 ++++++++++++---------- .../ControllerWorker/Shutdown.java | 6 ++- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java index 2f17116..5ad54e1 100644 --- a/gearman/controllerWorker/ControllerWorker/Boot.java +++ b/gearman/controllerWorker/ControllerWorker/Boot.java @@ -335,9 +335,11 @@ public class Boot extends Thread { } if (user.isEmpty()) { - logger.info(client.getIp() + " no user is logged in"); + logger.info(client.getIp() + " no user is logged in -CHECK PS-"); // no user is logged in, doing restart - client.setState(ClientState.RESTART_CLIENT); + //----- + // didn´t work in test-pool, check ps + client.setState(ClientState.A_USER_IS_LOGGED_IN); whoJobs.remove(client.getId()); } else { logger.info(client.getIp() + " a user is logged in"); diff --git a/gearman/controllerWorker/ControllerWorker/ClientState.java b/gearman/controllerWorker/ControllerWorker/ClientState.java index 5e63f16..bb78d90 100644 --- a/gearman/controllerWorker/ControllerWorker/ClientState.java +++ b/gearman/controllerWorker/ControllerWorker/ClientState.java @@ -1,36 +1,41 @@ package ControllerWorker; public enum ClientState { + //initialisation states CLIENT_INITIALIZED(1), PING_INITIALIZED(2), CLIENT_IS_ALIVE(3), WHO_INITIALIZED(4), - SHUTDOWN_CLIENT(5), - SHUTDOWN_INITIALIZED(6), - SHUTDOWN_COMMAND_SENT(7), - PING_SHUTDOWN_AGAIN(8), - PING_SHUTDOWN_INITIALIZED(9), - USER_IS_LOGGED_IN(10), - PS_INITIALIZED(11), - USER_IS_WORKING(12), - ERROR(13), - SUCCESS(14), - CLIENT_NOT_ALIVE(15), - WAKE_ON_LAN_INITIALIZED(16), - MAGIC_PACKET_SENT(17), - PING_WOL_AGAIN(18), - PING_WOL_INITIALIZED(19), - CHECKOS_INITIALIZED(20), - WRONG_OS(21), - A_USER_IS_LOGGED_IN(22), - RESTART_CLIENT(23), - RESTART_INITIALIZED(24), + SHUTDOWN_INITIALIZED(5), + PING_SHUTDOWN_INITIALIZED(6), + WAKE_ON_LAN_INITIALIZED(7), + CHECKOS_INITIALIZED(8), + PS_INITIALIZED(9), + PING_WOL_INITIALIZED(10), + RESTART_INITIALIZED(11), + PING_RESTART_SHUTDOWN_INITIALIZED(12), + PING_RESTART_BOOT_INITIALIZED(13), + + //other states + SHUTDOWN_CLIENT(14), + SHUTDOWN_COMMAND_SENT(15), + PING_SHUTDOWN_AGAIN(16), + USER_IS_LOGGED_IN(17), + USER_IS_WORKING(18), + CLIENT_NOT_ALIVE(19), + MAGIC_PACKET_SENT(20), + PING_WOL_AGAIN(21), + WRONG_OS(22), + A_USER_IS_LOGGED_IN(23), + RESTART_CLIENT(24), RESTART_COMMAND_SENT(25), PING_RESTART_SHUTDOWN_AGAIN(26), - PING_RESTART_SHUTDOWN_INITIALIZED(27), - CLIENT_IS_DOWN(28), - PING_RESTART_BOOT_AGAIN(29), - PING_RESTART_BOOT_INITIALIZED(30); + CLIENT_IS_DOWN(27), + PING_RESTART_BOOT_AGAIN(28), + + //final states + SUCCESS(29), + ERROR(30); ClientState(int state) { this.state = state; diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java index 2239c97..b8f55b8 100644 --- a/gearman/controllerWorker/ControllerWorker/Shutdown.java +++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java @@ -176,9 +176,11 @@ public class Shutdown extends Thread { } if (user.isEmpty()) { - logger.info(client.getIp() + " no user is logged in"); + logger.info(client.getIp() + " no user is logged in -CHECK PS-"); // no user is logged in - client.setState(ClientState.SHUTDOWN_CLIENT); + //----- + // didn´t work in test-pool, check ps + client.setState(ClientState.USER_IS_LOGGED_IN); whoJobs.remove(client.getId()); } else { logger.info(client.getIp() + " a user is logged in"); -- cgit v1.2.3-55-g7522