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

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-10-19 12:37:08 -0500 (Wed, 19 Oct 2011)
New Revision: 5246

Modified:
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
Echo swift's standard output on job failure

Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-10-19 03:10:18 UTC (rev 5245)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-10-19 17:37:08 UTC (rev 5246)
@@ -891,12 +891,17 @@
 exitcode=$?
 # Do any cleanup if swift exits in this manner
 if [ "$exitcode" != 0 ]; then
-    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"
+    echo "Error: Swift exited unexpectedly with return code $exitcode"
+
+
+    if [ ! -z "$swiftLoggingFlag" ]; then
+        echo "Verbose swift logging was disabled, enable for more information"
     fi
+    if [ ! "$keepdir" = TRUE ]; then
+        echo "Turn on keep work option to retain more logs"
+    fi
+    echo "Last 100 lines of Swift output follow.  See logs in $trundir for more information"
+    tail -n 100 $trundir/$out
 
     # TODO: resultpipe used togo somewhere need to handle some other way
     (   echo "error: swift exited unexpectedly with return code $exitcode" > swift.error &