history reporting: Break out minflight_by_time

Move this from sg-report-host-history so we can reuse it.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/HistoryReport.pm b/Osstest/HistoryReport.pm
index 3e2ad0d307cbf68386044aeb0f66ba5fec71dafc..b851ae45eaf5b3b3014a6821fe013181c5328537 100644 (file)
--- a/Osstest/HistoryReport.pm
+++ b/Osstest/HistoryReport.pm
@@ -37,6 +37,7 @@ BEGIN {
                         cache_write_entry
                         cache_finish
                         parallel_by_fork
+                        minflight_by_time
                    );
     %EXPORT_TAGS = ();
 
@@ -282,4 +283,19 @@ sub parallel_by_fork ($$$$) {
     exit $worst;
 }
 
+sub minflight_by_time ($) {
+    my ($timelimit) = @_;
+    my $minflightsq = db_prepare(<<END);
+           SELECT flight
+              FROM flights
+             WHERE started >= ?
+          ORDER BY flight ASC
+             LIMIT 1
+END
+    my $now = time // die $!;
+    $minflightsq->execute($now - $timelimit);
+    my ($minflight,) = $minflightsq->fetchrow_array();
+    $minflight //= 0;
+}
+
 1;

diff --git a/sg-report-host-history b/sg-report-host-history
index 0a2e9904f20ba8a5e52e22b3d96170fc50f37cb0..efe652bba6df803db1a467536e547ab050c9b12b 100755 (executable)
--- a/sg-report-host-history
+++ b/sg-report-host-history
@@ -95,19 +95,10 @@ sub computeflightsrange () {
 END
        $minflightsq->execute();
        ($minflight,) = $minflightsq->fetchrow_array();
+       $minflight //= 0;
     } else {
-       my $minflightsq = db_prepare(<<END);
-           SELECT flight
-              FROM flights
-             WHERE started >= ?
-          ORDER BY flight ASC
-             LIMIT 1
-END
-       my $now = time // die $!;
-        $minflightsq->execute($now - $timelimit);
-       ($minflight,) = $minflightsq->fetchrow_array();
+       $minflight = minflight_by_time($timelimit);
     }
-    $minflight //= 0;
 
     $flightcond = "(flight > $minflight)";