snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

hydra-notify: move buildFinished query in to the function impl

Browse source 
This is more consistent with the other event handlers, of dealing
with IDs and not objects.
This commit is contained in:
Graham Christensen 2021-08-06 10:16:29 -04:00
parent 9bce425c33
commit 9c5f317453
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/script/hydra-notify
View file

@ -47,7 +47,10 @@ sub buildStarted {
} }
sub buildFinished { sub buildFinished {
my ($build, @deps) = @_; my ($buildId, @deps) = @_;
my $build = $db->resultset('Builds')->find($buildId)
or die "build $buildId does not exist\n";
my $project = $build->project; my $project = $build->project;
my $jobsetName = $build->get_column('jobset'); my $jobsetName = $build->get_column('jobset');
@ -107,7 +110,7 @@ for my $build ($db->resultset('Builds')->search(
{ {
my $buildId = $build->id; my $buildId = $build->id;
print STDERR "sending notifications for build ${\$buildId}...\n"; print STDERR "sending notifications for build ${\$buildId}...\n";
buildFinished($build); buildFinished($build->id);
} }
@ -130,9 +133,7 @@ while (!$queued_only) {
buildStarted(int($payload[0])); buildStarted(int($payload[0]));
} elsif ($channelName eq "build_finished") { } elsif ($channelName eq "build_finished") {
my $buildId = int($payload[0]); my $buildId = int($payload[0]);
my $build = $db->resultset('Builds')->find($buildId) buildFinished($buildId, @payload[1..$#payload]);
or die "build $buildId does not exist\n";
buildFinished($build, @payload[1..$#payload]);
} elsif ($channelName eq "step_finished") { } elsif ($channelName eq "step_finished") {
stepFinished(int($payload[0]), int($payload[1])); stepFinished(int($payload[0]), int($payload[1]));
} }