From 9c5f3174535c3dc8e4856bb4e618363338d399a4 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 6 Aug 2021 10:16:29 -0400
Subject: [PATCH] hydra-notify: move buildFinished query in to the function
impl
This is more consistent with the other event handlers, of dealing
with IDs and not objects.
---
src/script/hydra-notify | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/script/hydra-notify b/src/script/hydra-notify
index 037bf409..08233142 100755
--- a/src/script/hydra-notify
+++ b/src/script/hydra-notify
@@ -47,7 +47,10 @@ sub buildStarted {
}
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 $jobsetName = $build->get_column('jobset');
@@ -107,7 +110,7 @@ for my $build ($db->resultset('Builds')->search(
{
my $buildId = $build->id;
print STDERR "sending notifications for build ${\$buildId}...\n";
- buildFinished($build);
+ buildFinished($build->id);
}
@@ -130,9 +133,7 @@ while (!$queued_only) {
buildStarted(int($payload[0]));
} elsif ($channelName eq "build_finished") {
my $buildId = int($payload[0]);
- my $build = $db->resultset('Builds')->find($buildId)
- or die "build $buildId does not exist\n";
- buildFinished($build, @payload[1..$#payload]);
+ buildFinished($buildId, @payload[1..$#payload]);
} elsif ($channelName eq "step_finished") {
stepFinished(int($payload[0]), int($payload[1]));
}