diff -r 4f11b6ecea2c -r 55ace296247b plugins/check_amanda-client --- a/plugins/check_amanda-client Sat Jan 25 23:50:20 2014 +0100 +++ b/plugins/check_amanda-client Tue Jan 28 11:21:36 2014 +0100 @@ -74,11 +74,8 @@ eval { amchecks @confs } or CRITICAL $@; - my @dles = eval { - compare_lists - confs => \@confs, - exclude => \@opt_exclude, - } + my @dles = + eval { compare_lists confs => \@confs, exclude => \@opt_exclude, } or CRITICAL $@; OK 'config: ' . join(', ', @confs), @dles; @@ -183,13 +180,18 @@ my $conf = shift; my $_ = qx(amdump_client --config '$conf' check 2>&1); + + /^config:\s+ + (BUSY Amanda is busy, retry later)/smx + and WARNING "$1\n"; + /^config:\s+$conf\n CHECKING\n .*\n Client.check:.1.host.checked.in.\d+\.\d+.seconds\.\s+0.problems.found\.\n .*\n The.check.is.finished$ - /smx or die "unexpected output from check:\n$_"; + /smx or UNKNOWN "unexpected output from check:\n$_"; } sub amchecks {