[Swift-commit] r7772 - in SwiftApps/tryswift: . config

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-04-16 17:16:26 -0500 (Wed, 16 Apr 2014)
New Revision: 7772

Modified:
   SwiftApps/tryswift/config/cf
   SwiftApps/tryswift/tryswift.php
Log:
Output formatting - remove prefix, adjust timestamp, change ticker names


Modified: SwiftApps/tryswift/config/cf
===================================================================
--- SwiftApps/tryswift/config/cf	2014-04-16 21:28:53 UTC (rev 7771)
+++ SwiftApps/tryswift/config/cf	2014-04-16 22:16:26 UTC (rev 7772)
@@ -1,3 +1,5 @@
 foreach.max.threads=10
 execution.retries=0
 wrapperlog.always.transfer=false
+ticker.date.format=hh:mm:ss
+ticker.prefix=

Modified: SwiftApps/tryswift/tryswift.php
===================================================================
--- SwiftApps/tryswift/tryswift.php	2014-04-16 21:28:53 UTC (rev 7771)
+++ SwiftApps/tryswift/tryswift.php	2014-04-16 22:16:26 UTC (rev 7772)
@@ -28,7 +28,7 @@
 
    # Run Swift
    system("echo Swift run starting at $( date +%T ) > $dirname/swift.out");
-   system("$swift_cmd >> $dirname/swift.out 2>&1 &");
+   system("$swift_cmd 2>&1 | sed -u -e 's/^[ \t]*//' -e s/'Selecting site:'/Ready:/g -e s/'Finished successfully:'/Done:/g >> $dirname/swift.out &");
 
    print "runs/$unique/swift.out\n";
    print "runs/$unique\n";