From 14eb5b03ded56db1cd5016c5e58bbb4772c99131 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 18 Oct 2011 13:40:44 +0200 Subject: some changes --- gearman/controllerWorker/ControllerWorker/Boot.java | 4 ++-- .../ControllerWorker/BootWorker.java | 21 ++++++++++++--------- .../controllerWorker/ControllerWorker/Shutdown.java | 2 +- .../ControllerWorker/ShutdownWorker.java | 4 +++- 4 files changed, 18 insertions(+), 13 deletions(-) (limited to 'gearman/controllerWorker') diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java index d960098..a560c80 100755 --- a/gearman/controllerWorker/ControllerWorker/Boot.java +++ b/gearman/controllerWorker/ControllerWorker/Boot.java @@ -42,7 +42,7 @@ public class Boot extends Thread { private Boolean error; public Boot(String eventName, Vector clients, String bootOS, - int updateRate, long waitTime, Vector psWhitelist, + int updateRate, long waitTime, long scsavTime, Vector psWhitelist, Vector psBlacklist, String gearmanServerAddress, int gearmanServerPort) { this.eventName = eventName; @@ -727,7 +727,7 @@ public class Boot extends Thread { JSONObject resultObj = (JSONObject) JSONValue.parse(result); if (!resultObj.containsKey("err")) { JSONArray ps = (JSONArray) resultObj.get("ps"); - //scsavPID = resultObj.get("pid").toString(); + //int scsavPID = Integer.parseInt(resultObj.get("pid").toString()); // boolean whitelistFound = false; boolean blacklistFound = false; diff --git a/gearman/controllerWorker/ControllerWorker/BootWorker.java b/gearman/controllerWorker/ControllerWorker/BootWorker.java index 8d3e612..a95f3a5 100755 --- a/gearman/controllerWorker/ControllerWorker/BootWorker.java +++ b/gearman/controllerWorker/ControllerWorker/BootWorker.java @@ -48,10 +48,12 @@ public class BootWorker extends AbstractGearmanFunction { .getString("gearman.server.host"); int gearmanServerPort = Integer.parseInt(ControllerWorkerMain .getApplication_ini().getString("gearman.server.port")); - long waitTime = Long.parseLong(ControllerWorkerMain - .getApplication_ini().getString("gearman.worker.waitTime")); - int updateRate = Integer.parseInt(ControllerWorkerMain - .getApplication_ini().getString("gearman.worker.updateRate")); + long waitTime = Long.parseLong(ControllerWorkerMain.getApplication_ini() + .getString("gearman.worker.waitTime")); + long scsavTime = Integer.parseInt(ControllerWorkerMain.getApplication_ini() + .getString("gearman.worker.scsavTime")); + int updateRate = Integer.parseInt(ControllerWorkerMain.getApplication_ini() + .getString("gearman.worker.updateRate")); String blacklist = ControllerWorkerMain.getApplication_ini().getString( "gearman.worker.ps.blacklist"); StringTokenizer blacklistTokenizer = new StringTokenizer(blacklist, ","); @@ -70,7 +72,8 @@ public class BootWorker extends AbstractGearmanFunction { } Boot boot = new Boot(event, clients, eventOS, updateRate, waitTime, - psWhitelist, psBlacklist, gearmanServerHost, gearmanServerPort); + scsavTime, psWhitelist, psBlacklist, gearmanServerHost, + gearmanServerPort); GearmanJobServerConnection gearmanConnection = new GearmanNIOJobServerConnection( gearmanServerHost, gearmanServerPort); GearmanClient gearmanClient = new GearmanClientImpl(); @@ -81,8 +84,8 @@ public class BootWorker extends AbstractGearmanFunction { jsonData.put("eventOS", eventOS); jsonData.put("clients", jsonClients); String dataString = JSONValue.toJSONString(jsonData); - GearmanJob job = GearmanJobImpl.createJob("status", dataString - .getBytes(), "status" + event); + GearmanJob job = GearmanJobImpl.createJob("status", dataString.getBytes(), + "status" + event); gearmanClient.submit(job); boot.start(); logger.info("Booting of " + event + " started"); @@ -92,8 +95,8 @@ public class BootWorker extends AbstractGearmanFunction { byte[] exceptions = new byte[0]; int numerator = 0; int denominator = 0; - GearmanJobResult gjr = new GearmanJobResultImpl(this.jobHandle, true, - res.getBytes(), warnings, exceptions, numerator, denominator); + GearmanJobResult gjr = new GearmanJobResultImpl(this.jobHandle, true, res + .getBytes(), warnings, exceptions, numerator, denominator); return gjr; } } \ No newline at end of file diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java index 8c90d7f..0b7082e 100755 --- a/gearman/controllerWorker/ControllerWorker/Shutdown.java +++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java @@ -41,7 +41,7 @@ public class Shutdown extends Thread { private Boolean error; public Shutdown(String eventName, Vector clients, int updateRate, - long waitTime, Vector psWhitelist, + long waitTime, long scsavTime, Vector psWhitelist, Vector psBlacklist, String gearmanServerAddress, int gearmanServerPort) { this.eventName = eventName; diff --git a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java index 631e8b7..65ad5b9 100755 --- a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java +++ b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java @@ -49,6 +49,8 @@ public class ShutdownWorker extends AbstractGearmanFunction { .getApplication_ini().getString("gearman.server.port")); long waitTime = Long.parseLong(ControllerWorkerMain .getApplication_ini().getString("gearman.worker.waitTime")); + long scsavTime = Integer.parseInt(ControllerWorkerMain + .getApplication_ini().getString("gearman.worker.scsavTime")); int updateRate = Integer.parseInt(ControllerWorkerMain .getApplication_ini().getString("gearman.worker.updateRate")); String blacklist = ControllerWorkerMain.getApplication_ini().getString( @@ -68,7 +70,7 @@ public class ShutdownWorker extends AbstractGearmanFunction { psBlacklist.add(blackEntry); } - Shutdown shutdown = new Shutdown(event, clients, updateRate, waitTime, + Shutdown shutdown = new Shutdown(event, clients, updateRate, waitTime, scsavTime, psWhitelist, psBlacklist, gearmanServerHost, gearmanServerPort); GearmanJobServerConnection gearmanConnection = new GearmanNIOJobServerConnection( gearmanServerHost, gearmanServerPort); -- cgit v1.2.3-55-g7522