wip reorg invent jobdb_flight_started_for_log_capture

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index b6c4a5f73b3f614c12cffa564e06fd3be6d0a203..bbda9b06a9327b7d8561fea5648d5acacebeb851 100644 (file)
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -159,4 +159,12 @@ END
     }
 }
 
+sub jobdb_flight_started_for_log_capture ($$) { #method
+    my ($mo, $flight) = @_;
+    my $started= $dbh_tests->selectrow_array(<<END);
+        SELECT started FROM flights WHERE flight=$flight
+END
+    return $started;
+}
+
 1;

diff --git a/Osstest/JobDB/Standalone.pm b/Osstest/JobDB/Standalone.pm
index 3094e5af4f4a8f1c6cedce53b503167c7a3bec28..efe9aacf8be4af292f31901bec10763e8ffac7da 100644 (file)
--- a/Osstest/JobDB/Standalone.pm
+++ b/Osstest/JobDB/Standalone.pm
@@ -83,4 +83,9 @@ sub jobdb_resource_shared_mark_ready { } #method
 
 sub jobdb_check_other_job { } #method
 
+sub jobdb_flight_started_for_log_capture ($$) { #method
+    my ($mo, $flight) = @_;
+    return time - 1; # just the most recent serial log then
+}
+
 1;

diff --git a/ts-logs-capture b/ts-logs-capture
index b325058ff69ff4e3365b8a6aafad1fbd15226346..be0f07c2305d4ba472092af663bfa3366580019b 100755 (executable)
--- a/ts-logs-capture
+++ b/ts-logs-capture
@@ -61,9 +61,8 @@ sub fetch_logs_serial () {
     my $logpat= $c{SerialLogPattern};
     my $vn;
 
-    my $started= $dbh_tests->selectrow_array(<<END);
-        SELECT started FROM flights WHERE flight=$flight
-END
+    my $started= $mjobdb->jobdb_flight_started_for_log_capture($flight);
+
     $logpat =~ s/\%(\w*)\%/
         !length $1 ? '' :
         ($vn=$1) eq 'host' ? $ho->{Name} :