Merge branch 'master' into fix-stale-detection-intervals

Author: inqrphl

lib/Thruk/Backend/Manager.pm

@@ -1715,13 +1715,13 @@ sub _do_on_peers {
         if($num_selected_backends == $num_failed) {
             $err = join("\n", map { Thruk::Utils::Filter::peer_name($_).": ".$c->stash->{'failed_backends'}->{$_} } sort keys %{$c->stash->{'failed_backends'}});
         }
-    }
 
-    # cleanup errors a bit, but print them first to debug log
-    if(!$err) {
         my $details_err = join("\n", map { Thruk::Utils::Filter::peer_name($_).": ".$c->stash->{'failed_backends'}->{$_} } sort keys %{$c->stash->{'failed_backends'}});
         _debug($details_err);
         _debug2(Carp::longmess("backend error"));
+    } elsif ($err) {
+        my($short_err, undef) = Thruk::Utils::extract_connection_error($err);
+        $con_errors = $num_selected_backends if defined $short_err;
     }
 
     &timing_breakpoint('_get_result: '.$function);
@@ -1730,7 +1730,7 @@ sub _do_on_peers {
             $err = join("\n", map { Thruk::Utils::Filter::peer_name($_).": ".$c->stash->{'failed_backends'}->{$_} } sort keys %{$c->stash->{'failed_backends'}});
         }
         # this means, this is a connection error -> debug log only
-        if($con_errors > 0 && $con_errors == scalar keys %{$c->stash->{'failed_backends'}}) {
+        if($con_errors > 0 && $con_errors == $num_selected_backends) {
             _debug($err);
             _debug2(Carp::longmess("backend error"));
             my($short_err, undef) = Thruk::Utils::extract_connection_error($err);
@@ -2111,7 +2111,7 @@ sub _get_result_lmd_with_retries {
     my $err = $@;
     return($result, $type, $totalsize, undef) unless $err;
 
-    _debug($err) if $err;
+    _trace($err) if $err;
     if($err && $err =~ m/^502:|bad\ request:/mx) { # lmd sends error 502 if all backends are down
         $c->stash->{'lmd_ok'} = 1;
     }