ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

RunCommand: Allow displaying command output

Browse Source
This commit is contained in:
Janne Heß
2021-12-26 16:14:28 +01:00
committed by Cole Helbling
parent 4cb5e6cd94
commit 796ce165d4
5 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/Hydra/Controller/Build.pm
View File

@ -137,6 +137,15 @@ sub view_log : Chained('buildChain') PathPart('log') {
}
sub view_runcommand_log : Chained('buildChain') PathPart('runcommand-log') {
my ($self, $c, $sha) = @_;
$c->stash->{is_runcommand} = 1;
$c->stash->{log_uri} = $c->uri_for($c->controller('Root')->action_for("runcommandlog"), $sha . "-" . $c->stash->{build}->id);
$c->stash->{template} = 'log.tt';
}
sub showLog {
my ($c, $mode, $finished, $drvPath) = @_;
$mode //= "pretty";

17
src/lib/Hydra/Controller/Root.pm
View File

@ -7,6 +7,7 @@ use base 'Hydra::Base::Controller::ListBuilds';
use Hydra::Helper::Nix;
use Hydra::Helper::CatalystUtils;
use Hydra::View::TT;
use Hydra::Model::DB;
use Nix::Store;
use Nix::Config;
use Encode;
@ -530,4 +531,20 @@ sub log :Local :Args(1) {
}
}
sub runcommandlog :Local :Args(1) {
my ($self, $c, $filename) = @_;
my $tail = $c->request->params->{"tail"};
die if defined $tail && $tail !~ /^[0-9]+$/;
my $logFile = Hydra::Model::DB::getHydraPath . "/runcommand-logs/" . substr($filename, 0, 2) . "/$filename";
if (-f $logFile) {
serveLogFile($c, $logFile, $tail);
return;
} else {
notFound($c, "The RunCommand log is not available.");
}
}
1;