ts-hosts-allocate-Executive: Print more info about booking to main log

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Fix whitespace style issue.

diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm
index aeb8c25e1f73bebb434bba8faee2923cf741090e..fb26882bd5e2fd9969cb22875903223b172a17a1 100644 (file)
--- a/Osstest/Executive.pm
+++ b/Osstest/Executive.pm
@@ -743,9 +743,19 @@ sub alloc_resources {
            }]);
 
            if ($bookinglist && $ok!=-1) {
+               my %prstart;
+               foreach my $book (@{ $bookinglist->{Bookings} }) {
+                   my $pr = $book->{Reso};
+                   $pr .= " [$book->{Xinfo}]" if defined $book->{Xinfo};
+                   push @{ $prstart{ $book->{Start} } }, $pr;
+               }
+               my $pr = '';
+               foreach my $start (sort { $a <=> $b } keys %prstart) {
+                   $pr .= " \@$start @{ $prstart{$start} }";
+               }
                my $jbookings= to_json($bookinglist);
                 chomp($jbookings);
-                logm("resource allocation: booking.");
+                logm("resource allocation: booking$pr.");
                $debugm->("bookings = ", $jbookings);
 
                printf $qserv "book-resources %d\n", length $jbookings