Merge pull request #2701 from Pinata-Consulting/logging-stringly-typed-fix

logging: stringly typed fixes

Author: maliberty

flow/scripts/util.tcl

@@ -1,11 +1,14 @@
 proc log_cmd {cmd args} {
   # log the command, escape arguments with spaces
-  puts -nonewline "$cmd[join [lmap arg $args {expr {[string match {* *} $arg] ? " \"$arg\"" : " $arg"}}] ""]"
+  set log_cmd "$cmd[join [lmap arg $args {format " %s" [expr {[string match {* *} $arg] ? "\"$arg\"" : "$arg"}]}] ""]"
+  puts $log_cmd
   set start [clock seconds]
   $cmd {*}$args
   set time [expr {[clock seconds] - $start}]
   if {$time >= 5} {
-    puts -nonewline " ($time seconds)"
+    # Ideally we'd use a single line, but the command can output text
+    # and we don't want to mix it with the log, so output the time it took afterwards.
+    puts "Took $time seconds: $log_cmd"
   }
   puts ""
 }