eval_added event: change interface to traceID\tjobsetID\tevaluationID
I was not going to break the interface until I noticed the current implementation uses the string literal \t.
This commit is contained in:
@ -7,6 +7,7 @@ use Hydra::Event::BuildQueued;
|
||||
use Hydra::Event::BuildStarted;
|
||||
use Hydra::Event::CachedBuildFinished;
|
||||
use Hydra::Event::CachedBuildQueued;
|
||||
use Hydra::Event::EvalAdded;
|
||||
use Hydra::Event::EvalCached;
|
||||
use Hydra::Event::EvalFailed;
|
||||
use Hydra::Event::EvalStarted;
|
||||
@ -18,6 +19,7 @@ my %channels_to_events = (
|
||||
build_started => \&Hydra::Event::BuildStarted::parse,
|
||||
cached_build_finished => \&Hydra::Event::CachedBuildFinished::parse,
|
||||
cached_build_queued => \&Hydra::Event::CachedBuildQueued::parse,
|
||||
eval_added => \&Hydra::Event::EvalAdded::parse,
|
||||
eval_cached => \&Hydra::Event::EvalCached::parse,
|
||||
eval_failed => \&Hydra::Event::EvalFailed::parse,
|
||||
eval_started => \&Hydra::Event::EvalStarted::parse,
|
||||
|
63
src/lib/Hydra/Event/EvalAdded.pm
Normal file
63
src/lib/Hydra/Event/EvalAdded.pm
Normal file
@ -0,0 +1,63 @@
|
||||
package Hydra::Event::EvalAdded;
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
sub parse :prototype(@) {
|
||||
unless (@_ == 3) {
|
||||
die "eval_added: payload takes exactly three arguments, but ", scalar(@_), " were given";
|
||||
}
|
||||
|
||||
my ($trace_id, $jobset_id, $evaluation_id) = @_;
|
||||
|
||||
unless ($jobset_id =~ /^\d+$/) {
|
||||
die "eval_added: payload argument jobset_id should be an integer, but '", $jobset_id, "' was given"
|
||||
}
|
||||
unless ($evaluation_id =~ /^\d+$/) {
|
||||
die "eval_added: payload argument evaluation_id should be an integer, but '", $evaluation_id, "' was given"
|
||||
}
|
||||
|
||||
return Hydra::Event::EvalAdded->new($trace_id, int($jobset_id), int($evaluation_id));
|
||||
}
|
||||
|
||||
sub new {
|
||||
my ($self, $trace_id, $jobset_id, $evaluation_id) = @_;
|
||||
return bless {
|
||||
"trace_id" => $trace_id,
|
||||
"jobset_id" => $jobset_id,
|
||||
"evaluation_id" => $evaluation_id,
|
||||
"jobset" => undef,
|
||||
"evaluation" => undef
|
||||
}, $self;
|
||||
}
|
||||
|
||||
sub interestedIn {
|
||||
my ($self, $plugin) = @_;
|
||||
return int(defined($plugin->can('evalAdded')));
|
||||
}
|
||||
|
||||
sub load {
|
||||
my ($self, $db) = @_;
|
||||
|
||||
if (!defined($self->{"jobset"})) {
|
||||
$self->{"jobset"} = $db->resultset('Jobsets')->find({ id => $self->{"jobset_id"}})
|
||||
or die "Jobset $self->{'jobset_id'} does not exist\n";
|
||||
}
|
||||
|
||||
if (!defined($self->{"evaluation"})) {
|
||||
$self->{"evaluation"} = $db->resultset('JobsetEvals')->find({ id => $self->{"evaluation_id"}})
|
||||
or die "Jobset $self->{'jobset_id'} does not exist\n";
|
||||
}
|
||||
}
|
||||
|
||||
sub execute {
|
||||
my ($self, $db, $plugin) = @_;
|
||||
|
||||
$self->load($db);
|
||||
|
||||
$plugin->evalAdded($self->{"trace_id"}, $self->{"jobset"}, $self->{"evaluation"});
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
1;
|
@ -47,6 +47,11 @@ sub instantiate {
|
||||
# my ($self, $traceID, $jobset) = @_;
|
||||
# }
|
||||
|
||||
# # Called when $evaluation of $jobset has completed successfully.
|
||||
# sub evalAdded {
|
||||
# my ($self, $traceID, $jobset, $evaluation) = @_;
|
||||
# }
|
||||
|
||||
# # Called when build $build has been queued.
|
||||
# sub buildQueued {
|
||||
# my ($self, $build) = @_;
|
||||
|
@ -771,7 +771,7 @@ sub checkJobsetWrapped {
|
||||
});
|
||||
|
||||
$db->storage->dbh->do("notify eval_added, ?", undef,
|
||||
join('\t', $tmpId, $ev->id));
|
||||
join("\t", $tmpId, $jobset->get_column('id'), $ev->id));
|
||||
|
||||
if ($jobsetChanged) {
|
||||
# Create JobsetEvalMembers mappings.
|
||||
|
@ -98,6 +98,7 @@ $listener->subscribe("build_queued");
|
||||
$listener->subscribe("build_started");
|
||||
$listener->subscribe("cached_build_finished");
|
||||
$listener->subscribe("cached_build_queued");
|
||||
$listener->subscribe("eval_added");
|
||||
$listener->subscribe("eval_cached");
|
||||
$listener->subscribe("eval_failed");
|
||||
$listener->subscribe("eval_started");
|
||||
|
Reference in New Issue
Block a user