135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#228 timeout setting (default 10min) for backend jobs

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-31 14:02:11 +00:00
parent afeac23fba
commit 2c0d0b3cc7
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/App/Netdisco/Worker/Runner.pm
View File

@@ -6,9 +6,11 @@ use App::Netdisco::Util::Permission qw/check_acl_no check_acl_only/;
use aliased 'App::Netdisco::Worker::Status';
use Try::Tiny;
use Time::HiRes ();
use Module::Load ();
use Scope::Guard 'guard';
use Storable 'dclone';
use Sys::SigAction 'timeout_call';
use Moo::Role;
use namespace::clean;
@@ -55,12 +57,30 @@ sub run {
my $configguard = guard { set(device_auth => \@userconf) };
set(device_auth => \@newuserconf);
# run check phase and if there are workers then one MUST be successful
$self->run_workers('workers_check');
return if not $job->check_passed;
my $runner = sub {
my ($self, $job) = @_;
# run other phases
$self->run_workers("workers_${_}") for qw/early main user/;
# run check phase and if there are workers then one MUST be successful
$self->run_workers('workers_check');
# run other phases
if ($job->check_passed) {
$self->run_workers("workers_${_}") for qw/early main user/;
}
};
my $maxtime = ((defined setting($job->action .'_timeout'))
? setting($job->action .'_timeout') : setting('timeout'));
if ($maxtime) {
debug sprintf '%s: running with timeout %ss', $job->action, $maxtime;
if (timeout_call($maxtime, $runner, ($self, $job))) {
debug sprintf '%s: timed out!', $job->action;
$job->add_status( Status->error("job timed out after $maxtime sec") );
}
}
else {
$runner->($self, $job);
}
}
sub run_workers {