[Swift-commit] r4452 - SwiftApps/SwiftR/Swift/exec

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-05-06 16:17:29 -0500 (Fri, 06 May 2011)
New Revision: 4452

Modified:
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
improved error message when swift fails to start correctly.


Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-05-06 19:49:43 UTC (rev 4451)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-05-06 21:17:29 UTC (rev 4452)
@@ -565,6 +565,7 @@
 # Standard clenuup actions
 function stdcleanup_start {
     # don't accept any more requests: unlink fifo from filesystem
+    echo stdcleanup_start 1&>2
     if [ -p requestpipe ]; then
         rm requestpipe 
     fi
@@ -727,9 +728,17 @@
 exitcode=$?
 # Do any cleanup if swift exits in this manner
 if [ "$exitcode" != 0 ]; then
-    echo "error: Swift exited unexpectedly with $exitcode" > resultpipe &
-    echopid=$!
-    sleep 5
-    kill $echopid &> /dev/null
+    echo "error: Swift exited unexpectedly with return code $exitcode"
+    if [ "$keepdir" = TRUE ]; then
+        echo "See logs in $trundir for more information"
+    else
+        echo "Turn on keep work option to retain logs"
+    fi
+
+    (   echo "error: swift exited unexpectedly with return code $exitcode" > resultpipe 
+        echopid=$!
+        sleep 5
+        kill $echopid 
+    ) &> /dev/null &
 fi