From 22fba8c1d735ed1489fad4e1027edb30d3e7b8d9 Mon Sep 17 00:00:00 2001
From: Louwrentius <Louwrentius@7749c172-d934-11dd-87b6-9d1a99559f42>
Date: Sun, 8 Nov 2009 16:58:06 +0000
Subject: [PATCH] More fixes for distributed operation.

---
 branches/distributed-ppss/ppss.sh | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/branches/distributed-ppss/ppss.sh b/branches/distributed-ppss/ppss.sh
index bbe770d..a554ea0 100755
--- a/branches/distributed-ppss/ppss.sh
+++ b/branches/distributed-ppss/ppss.sh
@@ -1472,35 +1472,34 @@ listen_for_job () {
         # This mechanism makes PPSS asynchronous.
 
         # Gives a status update on the current progress..
-        echo "$event" >> event.txt
         
         if [ "$event" == "$STOP_KEY"  ]
         then
             ((DIED++))
             if [ "$DIED" -ge "$MAX_NO_OF_RUNNING_JOBS" ] 
             then
-                break
-            fi
-            RES=$((MAX_NO_OF_RUNNING_JOBS-DIED))
-            if [ "$RES" == "1" ]
-            then
-                log INFO "$((MAX_NO_OF_RUNNING_JOBS-DIED)) job is remaining.       "
+                kill_process
             else
-                log INFO "$((MAX_NO_OF_RUNNING_JOBS-DIED)) jobs are remaining."
-                echo -en "\033[1A"
+                RES=$((MAX_NO_OF_RUNNING_JOBS-DIED))
+                if [ "$RES" == "1" ]
+                then
+                    log INFO "$((MAX_NO_OF_RUNNING_JOBS-DIED)) job is remaining.       "
+                else
+                    log INFO "$((MAX_NO_OF_RUNNING_JOBS-DIED)) jobs are remaining."
+                    echo -en "\033[1A"
+                fi
             fi
         elif [ "$event" == "$KILL_KEY" ]
         then
             for x in $PIDS
             do
-                log DEBUG "Killing pid $x..."
                 kill $x >> /dev/null 2>&1
             done
-            cleanup
             if [ ! -z "$SSH_MASTER_PID" ]
             then
-                kill -9 "$SSH_MASTER_PID" >> /dev/null 2>&1 
+                kill "$SSH_MASTER_PID" #>> /dev/null 2>&1 
             fi
+            cleanup
             log INFO "Finished. Consult ./$JOB_LOG_DIR for job output."
             break
         else
@@ -1523,6 +1522,7 @@ listen_for_job () {
             fi
         fi
     done
+
     set_status STOPPED
     log DEBUG "Listener stopped."
     exit
@@ -1717,7 +1717,6 @@ main () {
 
         * )
                     init_vars
-                    test_server
                     get_all_items
                     listen_for_job "$MAX_NO_OF_RUNNING_JOBS" & 2>&1 >> /dev/null
                     LISTENER_PID=$!