Merge branch 'master' into og-coreplugins

This commit is contained in:
Oliver Gorwits
2017-08-14 18:10:29 +01:00
10 changed files with 70 additions and 38 deletions

View File

@@ -241,10 +241,17 @@ foreach my $host (@hostlist) {
subaction => $extra,
});
my $actiontext = (
($job->device ? ('['.$job->device->ip.']') : '') .
($job->action eq 'show' ? ('/'.$job->subaction) : '')
);
# do job
my ($status, $log);
try {
info sprintf '%s: started at %s', $action, scalar localtime;
info sprintf '%s: %s started at %s',
$action, $actiontext, scalar localtime;
($status, $log) = $worker->$action($job);
}
catch {