summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorSebastian Wagner2011-08-18 13:28:43 +0200
committerSebastian Wagner2011-08-18 13:28:43 +0200
commit7f99c2809c99b35841324843af406dd4e9afc664 (patch)
treee0aaa96c299cd7635c9182cb976bfe40a9264a92 /gearman
parentModels noch verändert (diff)
downloadpoolctrl-7f99c2809c99b35841324843af406dd4e9afc664.tar.gz
poolctrl-7f99c2809c99b35841324843af406dd4e9afc664.tar.xz
poolctrl-7f99c2809c99b35841324843af406dd4e9afc664.zip
more ps-logic
Diffstat (limited to 'gearman')
-rw-r--r--gearman/controllerWorker/ControllerWorker/Shutdown.java19
1 files changed, 17 insertions, 2 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index bdd3c9d..15ec623 100644
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -382,12 +382,27 @@ public class Shutdown extends Thread {
JSONArray ps = (JSONArray) resultObj
.get("ps");
boolean isWorking = true;
- if (isWorking) {
+
+ //LOGIC_TESTS
+ /*System.out.println("######");
+ System.out.println("######");
+ System.out.println("firefox: " + ps.toString().contains("firefox-bin")); // browser firefox
+ System.out.println("chromium: " + ps.toString().contains("chromium-browse")); // browser chromium
+ System.out.println("email: " + ps.toString().contains("thunderbird-bi")); // email
+ System.out.println("pdf-viewer: " + ps.toString().contains("evince")); // pdf-viewer
+ System.out.println("office: " + ps.toString().contains("soffice.bin")); // office
+ System.out.println("eclipse: " + ps.toString().contains("eclipse")); // eclipse
+ System.out.println("######");
+ System.out.println("gnome screensaver: " + ps.toString().contains("gnome-screensav")); // gnome screensaver
+ System.out.println("kde screensaver: " + ps.toString().contains("Kscreensaver")); // kde screensaver
+ System.out.println("######");*/
+
+ if (ps.toString().contains("firefox.bin") || ps.toString().contains("chromium-browse") || ps.toString().contains("thunderbird-bi") || ps.toString().contains("evince") || ps.toString().contains("soffice.bin") || ps.toString().contains("eclipse")) {
System.out.println(ipAddress
+ " is working");
status.put(clientID, 11); // is working
psJobs.remove(clientID);
- } else {
+ } else if (ps.toString().contains("gnome-screensav") || ps.toString().contains("Kscreensaver")) {
System.out.println(ipAddress
+ " is not working");
status.put(clientID, 4); // is not working