Merge pull request #18749 from mlschroe/master

[backend] BSRepServer::Checker: also support appimage, livebuild, sim…

Author: mlschroe

src/backend/BSRepServer/Checker.pm

@@ -43,6 +43,9 @@ my %handlers = (
   'docker'          => BSSched::BuildJob::Docker->new(),
   'fissile'         => BSSched::BuildJob::Docker->new(),
   'mkosi'           => BSSched::BuildJob::Image->new(),
+  'appimage'        => BSSched::BuildJob::Image->new(),
+  'livebuild'       => BSSched::BuildJob::Image->new(),
+  'simpleimage'     => BSSched::BuildJob::Image->new(),
   'buildenv'        => BSSched::BuildJob::BuildEnv->new(),
   'unknown'         => BSSched::BuildJob::Unknown->new(),
   'default'         => BSSched::BuildJob::Package->new(),

src/backend/BSServer.pm

@@ -673,13 +673,25 @@ sub request_infostr {
   my ($req) = @_;
   my $id = $req->{'reqid'} || $req->{'keepalive_count'};
   $id = $id ? "$$.$id" : $$;
-  return sprintf("%s: %3ds %-7s %-22s %s%s\n", BSUtil::isotime($req->{'starttime'}), time() - $req->{'starttime'}, "[$id]",
+  my $extrastr = '';
+  if ($req->{'starttime'} && $req->{'client_time'}) {
+    my $client_wait_time = $req->{'starttime'} - $req->{'client_time'};
+    $extrastr = sprintf("+%d", $client_wait_time) if $client_wait_time > 0 && $client_wait_time < 3600 * 24;
+  }
+  return sprintf("%s: %3ds$extrastr %-7s %-22s %s%s\n", BSUtil::isotime($req->{'starttime'}), time() - $req->{'starttime'}, "[$id]",
       "$req->{'action'} ($req->{'peer'})", $req->{'path'}, ($req->{'query'}) ? "?$req->{'query'}" : '');
 }
 
 sub log_slow_requests {
   my ($conf, $req) = @_;
-  return unless $req && $conf->{'slowrequestthr'} && $req->{'starttime'} && time() - $req->{'starttime'} >= $conf->{'slowrequestthr'};
+  return unless $req && $conf->{'slowrequestthr'} && $req->{'starttime'};
+  my $now = time();
+  my $extratime = 0;
+  if ($req->{'client_time'}) {
+    my $client_wait_time = $req->{'starttime'} - $req->{'client_time'};
+    $extratime = $client_wait_time if $client_wait_time > 0 && $client_wait_time < 3600 * 24;
+  }
+  return unless $req && $conf->{'slowrequestthr'} && $req->{'starttime'} && $now - $req->{'starttime'} + $extratime >= $conf->{'slowrequestthr'};
   my $log = $req->{'slowrequestlog'} || $conf->{'slowrequestlog'};
   return unless $log;
   my $msg = request_infostr($req);

src/backend/BSStdServer.pm

@@ -114,6 +114,10 @@ sub dispatch {
     my $peerip = ($req->{'headers'} || {})->{lc($conf->{'trusted_peerip_header'})};
     $req->{'peerip'} = $req->{'peer'} = $peer = $peerip if $peerip && $peerip =~ /^[0-9a-fA-F\.\:]+$/s;
   }
+  if (!$isajax && $conf->{'client_time_header'}) {
+    my $client_time = ($req->{'headers'} || {})->{lc($conf->{'client_time_header'})};
+    $req->{'client_time'} = 0 + $client_time if $client_time && $client_time =~ /^\d+$/;
+  }
   my $msg = sprintf("%-22s %s%s",
     "$req->{'action'} ($peer)", $req->{'path'},
     defined($req->{'query'}) ? "?$req->{'query'}" : '',

src/backend/bs_srcserver

@@ -8153,6 +8153,7 @@ my $conf = {
   'errorreply' => \&BSRegistryServer::errreply,
   'run' => \&run,
   'periodic' => \&periodic,
+  'client_time_header' => 'X-Frontend-Start',
 };
 
 my $aconf = {