- prefix each build log line with the second since build started
authorAdrian Schröter <adrian@suse.de>
Mon, 16 Jul 2012 12:52:32 +0000 (14:52 +0200)
committerAdrian Schröter <adrian@suse.de>
Mon, 16 Jul 2012 12:52:32 +0000 (14:52 +0200)
build

diff --git a/build b/build
index aa03200..3e1de4f 100755 (executable)
--- a/build
+++ b/build
@@ -1379,10 +1379,13 @@ if test -n "$LOGFILE" -a -z "$shell" ; then
     echo  logging output to $LOGFILE...
     rm -f $LOGFILE
     touch $LOGFILE
+    # set start time, to be substracted for build log timestamps
+    STARTTIME=`perl -e 'print time()'`
+
     if test -n "$VM_IMAGE" ; then
-       exec 1> >(exec -a 'build logging tee' perl -e 'open(F,">>",$ARGV[0])||die("$ARGV[0]: $!\n");$|=1;select(F);$|=1;while(<STDIN>){print STDOUT;s/^\r//s;s/\r\n/\n/gs;print F}' $LOGFILE) 2>&1
+       exec 1> >(exec -a 'build logging' perl -e 'open(F,">>",$ARGV[0])||die("$ARGV[0]: $!\n");$|=1;select(F);$|=1;while(<STDIN>){my $p=sprintf("[%5ds] ", time()-'$STARTTIME');print STDOUT $p.$_;s/^\r//s;s/\r\n/\n/gs;print F $p.$_}' $LOGFILE) 2>&1
     else
-       exec 1> >(exec -a 'build logging tee' tee -a $LOGFILE) 2>&1
+       exec 1> >(exec -a 'build logging' perl -e 'open(F,">>",$ARGV[0])||die("$ARGV[0]: $!\n");$|=1;select(F);$|=1;while(<STDIN>){my $p=sprintf("[%5ds] ", time()-'$STARTTIME');print STDOUT $p.$_;print F $p.$_}' $LOGFILE) 2>&1
     fi
 fi